Android Merger
73ba7dddc3
Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
...
am: afff62b0b9
Change-Id: I2e29a7f60db399922822459d8e686d08ad4fd3a7
2018-01-10 19:34:19 +00:00
Adam Vartanian
39127a559b
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
...
am: bdf5a47c67 -s ours
Change-Id: I1b319e1ee4806d7a513bcf6741240990eab74537
2018-01-10 19:30:12 +00:00
Android Merger
afff62b0b9
Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
2018-01-10 19:26:23 +00:00
Android Merger
865adee70d
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
am: 293664a1fb
Change-Id: I4fb988a1a18189c4dd34d2154b42be227d346c82
2018-01-10 19:25:56 +00:00
Android Merger
dedfb2ca1f
Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours
2018-01-10 19:25:30 +00:00
Android Merger
6517b3c979
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
am: d9aadde604
Change-Id: I711a4cd0a6d5ce2a8a956c6d4e63f6e1e66445a5
2018-01-10 19:25:04 +00:00
Adam Vartanian
bdf5a47c67
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: d9ac06f2c2 -s ours
Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
2018-01-10 19:23:29 +00:00
Adam Vartanian
cebea26b62
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: df249cbcbb -s ours
Change-Id: I4a60d7a706e5753fe7402a6d27c67deaa5ca02ef
2018-01-10 19:21:23 +00:00
Android Merger
293664a1fb
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
2018-01-10 19:18:17 +00:00
Android Merger
c0b039c346
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
am: bc18e7e105
Change-Id: I383d04d335a27c522758b7838f124333822c5e02
2018-01-10 19:17:53 +00:00
Android Merger
36407c961d
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
2018-01-10 19:17:29 +00:00
Android Merger
599f3a3c3f
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
am: fa209394f0
Change-Id: I3fa858e8b4a2da17f89f544b1ca802de84909830
2018-01-10 19:17:04 +00:00
Adam Vartanian
d9ac06f2c2
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
...
am: dfbb7a24e1 -s ours
Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
2018-01-10 19:16:50 +00:00
Android Merger
d9aadde604
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
2018-01-10 19:15:20 +00:00
Android Merger
c8d546b3ab
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
am: f59fbfb5a4
Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
2018-01-10 19:14:50 +00:00
Adam Vartanian
d89f75a3db
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
...
am: 7955a4e8d8 -s ours
Change-Id: If66b41e17d12e833e1b93a8104e88220852c77b0
2018-01-10 19:14:29 +00:00
Android Merger
bc18e7e105
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
* changes:
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
2018-01-10 19:13:47 +00:00
Adam Vartanian
2ba7ef5b48
Merge changes from topic "mm" into marshmallow-cts-dev
...
am: 2996702607
Change-Id: I210f8b36685e9e1dbcc2916b921501ed55ddb1fb
2018-01-10 19:13:07 +00:00
Adam Vartanian
df249cbcbb
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
...
am: 175d980772 -s ours
Change-Id: I9f2de682ef6178fa6c58781e393f53b96ccb2e1e
2018-01-10 19:12:57 +00:00
Adam Vartanian
dfbb7a24e1
DO NOT MERGE Add CTS test for URI fix.
...
am: 1efb5151db -s ours
Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e
2018-01-10 19:12:49 +00:00
Android Merger
fa209394f0
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
* changes:
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
am: 76faaa3996
Change-Id: I8c07170ab322c1ea8d40df9302733132a604b0c9
2018-01-10 19:10:54 +00:00
Adam Vartanian
7955a4e8d8
DO NOT MERGE Add CTS test for URI fix.
...
am: 08044f045c -s ours
Change-Id: I41b3f407c0e7714b80e935fb7ae556a2558cd143
2018-01-10 19:10:30 +00:00
Android Merger
f59fbfb5a4
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e
Merge changes from topic "n" into nougat-cts-dev
...
am: a220d6d27d
Change-Id: I406953a4713b768012d123a33db06268e8cf3799
2018-01-10 19:07:44 +00:00
Adam Vartanian
175d980772
DO NOT MERGE Add CTS test for URI fix.
...
am: 53a9c9bc34 -s ours
Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
2018-01-10 19:07:26 +00:00
Treehugger Robot
76faaa3996
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:06:35 +00:00
Treehugger Robot
2996702607
Merge changes from topic "mm" into marshmallow-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:05:55 +00:00
Treehugger Robot
a220d6d27d
Merge changes from topic "n" into nougat-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 18:59:52 +00:00
Adam Vartanian
08044f045c
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 13:31:30 -08:00
Adam Vartanian
53a9c9bc34
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 12:57:18 -08:00
Adam Vartanian
1efb5151db
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 12:52:51 -08:00
Sudheer Shanka
b7a503b578
Skip unsupported tests on low ram devices.
...
Notification listeners are not allowed on low ram devices.
Skip testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
on low ram devices since these tests depend on being able to
register notification listeners.
Bug: 70242457
Bug: 70545780
Test: testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I8ce6f330760042ca790cd6fb10e62ebe86498a06
2017-12-21 11:23:21 -08:00
Adam Vartanian
cd4ab882f0
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226
...
am: 2516305c8c
Change-Id: I7e7f5363c4747289c9817e58cb6636839aa2da05
2017-11-08 00:29:47 +00:00
Adam Vartanian
2516305c8c
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a
...
am: 3d7e43b226
Change-Id: I318a6c318db25c5d4dd4be3426b480a9de0b9b11
2017-11-08 00:05:43 +00:00
Adam Vartanian
3d7e43b226
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285
...
am: f259a8e37a
Change-Id: Iaf798faba75cb1f543e012eee98707e20a08e8ce
2017-11-07 23:41:55 +00:00
Adam Vartanian
83f1303285
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646
...
am: fb73667810
Change-Id: Ib6d1cc2531123894f917b13d388845164e6eec32
2017-11-07 22:56:57 +00:00
Adam Vartanian
fb73667810
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052
...
am: 2204809646
Change-Id: Ic96d9b4693178421303c45ac628c456b66cdf655
2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
...
am: 1e1de4f052
Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
...
am: e88ef1b832
Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
...
am: c210cc1a90
Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa
Add CTS test for URI fix. am: a01da8536c
...
am: b1b5379591
Change-Id: Ib1bcf1c84ee878161f812e8a9ba762a746329a3b
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591
Add CTS test for URI fix.
...
am: a01da8536c
Change-Id: I21c707648e6cc02b267f663bd02140dd66b6bd80
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c
Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Etan Cohen
66aec9074f
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc
...
am: 294f9ae45b
Change-Id: Id6806b4936ec7e3ae9bcc2ae3b62ff37b370e69b
2017-10-24 18:08:45 +00:00
Etan Cohen
294f9ae45b
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0
...
am: 8e699c86fc
Change-Id: I7860a70a1cb206f4af24441886efa2cb9512b3b5
2017-10-24 18:02:30 +00:00
Etan Cohen
8e699c86fc
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
...
am: d5c00ceee0
Change-Id: I9b42b412355a641f2bb8a06f031fced7575bab44
2017-10-24 17:57:29 +00:00
Treehugger Robot
d5c00ceee0
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
2017-10-24 17:50:46 +00:00
Etan Cohen
591518f378
[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network
...
Before calling the testAddPasspointConfigWithCertCredential
we need to check number of network already present in device
Bug: 67630919
Test: android.server.cts.CtsNetTestCases, WifiManagerTest
Change-Id: If643ab7bde760a65e9a5b1e9d47af53378a178fd
2017-10-23 23:07:59 +00:00
Ningyuan Wang
8666bc8c23
CTS: update wifi scan timeout to 9 seconds
...
This creates a new timeout constant for scan duration, so
this test doesn't share timeout constant with other events.
This also increases the scan timeout time to 9 seconds per
our estimation.
Bug: 67462981
Test: cts-tradefed run cts -m CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest#testWifiScanTimestamp
Change-Id: I7e1dea64bc8df3e4b31adbf8b5f05c8564a739b1
2017-10-10 13:26:34 -07:00