Alex Vakulenko
5a35f88cbb
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
...
am: 9992c29071
Change-Id: I7aa6862055d7252b1c801b5deee4b81d7b707c4b
2018-01-12 00:12:38 +00:00
Treehugger Robot
9992c29071
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
2018-01-12 00:01:30 +00:00
Adam Vartanian
db64de57e0
Merge changes from topic "m" into oreo-cts-dev
...
am: f40fcd461a
Change-Id: I94fd78a459738c16a7aa25425eacef5a4bda4de6
2018-01-11 22:54:47 +00:00
Adam Vartanian
ad0b72a35f
DO NOT MERGE Add CTS test for URI fix.
...
am: a02bbf31c4 -s ours
Change-Id: Ie6deaf23a60a51cae1fc5441006649134640e44b
2018-01-11 22:54:29 +00:00
Treehugger Robot
f40fcd461a
Merge changes from topic "m" into oreo-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Verify b/67737022 fix presence
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Test that createBitmap(65535,65535) throws OOME
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
DO NOT MERGE Add new test type to StagefrightTest
2018-01-11 22:42:43 +00:00
Alex Vakulenko
9a35c697dc
Add a delay before toggling WiFi to let listening activity to start up
...
testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent()
starts up a helper activity that listens to network connection/disconnection
notification. In many cases the test fails because the activity is just
able to start up and initialize itself before the first toggle event
arrives and in many cases it just misses by a matter of 100ms.
Added a short sleep after we start the activity and before we start
toggling WiFi to let the activity a chance to receive the first
notification.
Bug: 70988664
Change-Id: Ie122770fc8447a936d079fae7bdce61b10cf6dc2
2018-01-10 17:27:32 -08:00
Adam Vartanian
4ccdfd28cf
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67 am: 1c1e1188b8 am: 6c9e5f4147
...
am: 17f865e508
Change-Id: I225e7d2561a6a91c345bbaf802f7c07c3cf91769
2018-01-10 21:23:47 +00:00
Adam Vartanian
0f7b85edfa
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d
...
am: 67b508b029 -s ours
Change-Id: If5c07b70bdcffe6d099b7a2ef3da6dd12635fc97
2018-01-10 21:22:03 +00:00
Android Merger
5722d0a4ec
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94
...
am: 60a61510cd
Change-Id: I7a8a2d7c487fbfd20885dd00e3606d1d5c8777a9
2018-01-10 21:02:13 +00:00
Adam Vartanian
6dc8d5cc2f
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078
...
am: 4173b8bf71 -s ours
Change-Id: I6093940b82b4e530332665731c56905a2c1c891a
2018-01-10 21:00:27 +00:00
Adam Vartanian
6c9e5f4147
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67
...
am: 1c1e1188b8
Change-Id: I8378e67499eef036024ead9bb80a2ec46c1284bf
2018-01-10 20:46:27 +00:00
Adam Vartanian
a49852f69d
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf
...
am: d1d09b39d9
Change-Id: I4f0e6b89262f102756919467ec47786146ddbd7b
2018-01-10 20:44:45 +00:00
Adam Vartanian
1c1e1188b8
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d
...
am: 30b0aafe67
Change-Id: I9474a516750548db3e35cde1175a3585dd8b5a50
2018-01-10 20:34:19 +00:00
Adam Vartanian
d1d09b39d9
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f
...
am: d18aefffcf
Change-Id: I7c8519b6a1a747d2e104f5a9b349e2607906bdb5
2018-01-10 20:32:57 +00:00
Android Build Merger (Role)
d82562eb66
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f
...
am: bd14f4f4ff
Change-Id: I6811725aa66fb6c10e39c1c675c2dcac0a5dcd6a
2018-01-10 20:27:08 +00:00
Adam Vartanian
a69195c421
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8
...
am: 09a3a15afe
Change-Id: Ib7e7465076cc818c0523253a0ee19563245217e6
2018-01-10 20:20:10 +00:00
Adam Vartanian
30b0aafe67
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab
...
am: a7461df68d
Change-Id: I69612b0668fb43f0026b2fe37fd58becec9e15a3
2018-01-10 20:19:57 +00:00
Adam Vartanian
d18aefffcf
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours
...
am: abd196715f
Change-Id: I4286ec388c3f85b681909b049cac2a2378e6ed27
2018-01-10 20:18:47 +00:00
Adam Vartanian
6329a0e2ae
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff
...
am: bc161e0872 -s ours
Change-Id: Ib7ff35497ec6f02d58db695954ae32b2ba75bb01
2018-01-10 20:18:34 +00:00
Android Merger
c0a1334c94
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37
...
am: 25b87f5cad
Change-Id: Ia60c9772588e09116ba94c71cd7e22bcf24972f0
2018-01-10 20:13:45 +00:00
Adam Vartanian
7529662078
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c
...
am: e37b9c0c15
Change-Id: Ifb4d28de149b96376bd01d0dae82e2ea4677c67e
2018-01-10 20:12:04 +00:00
Android Build Merger (Role)
7169916e4f
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev
...
am: 2cfab2140f
Change-Id: I47143f087d2b880301afada9e50d5a84995b04d5
2018-01-10 19:54:32 +00:00
Android Merger
a88a1fed27
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331
...
am: 178f67f69d
Change-Id: Ifb2144f66596e22fc1a985815b98b63e16ce212c
2018-01-10 19:53:42 +00:00
Adam Vartanian
9dcd9abb3e
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: bf44542d59 am: 9d37478448
...
am: f927fe1b92 -s ours
Change-Id: I2d66e421530d89f53ae02bf8e41a9ac555cb40f2
2018-01-10 19:51:04 +00:00
Adam Vartanian
a7461df68d
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442
...
am: 782f3283ab
Change-Id: I697056d07928751b8a9fd28b1e7d62dfd11cb2ca
2018-01-10 19:50:58 +00:00
Adam Vartanian
abd196715f
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900
...
am: b1969e0aa9 -s ours
Change-Id: I74ea94e5691e20770173a16a4236d894ed016a39
2018-01-10 19:50:09 +00:00
Android Merger
25b87f5cad
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70
...
am: 02489fed37
Change-Id: Icab80887d9a2f2cb8efe9da889a7c6ddd2f41ba1
2018-01-10 19:47:30 +00:00
Adam Vartanian
e37b9c0c15
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a
...
am: 43aea5638c
Change-Id: I4d696f302b745c844bb049556f17bb87f828c64a
2018-01-10 19:45:59 +00:00
Android Build Merger (Role)
2f8017a25a
Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev
...
* changes:
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 am: ce2230abfd am: 23d6ba00ec am: f26da6af2c
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 78f5d24a4f am: 2f42f87a5f am: be7378e99b -s ours
2018-01-10 19:45:11 +00:00
Adam Vartanian
0f3607adf8
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd
...
am: c6545ebce1
Change-Id: Ie8d9cf63e077a46a295f9314658ef3633b5e753b
2018-01-10 19:42:01 +00:00
Adam Vartanian
32a33fba66
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 am: ce2230abfd am: 23d6ba00ec
...
am: f26da6af2c
Change-Id: I63a73cd58a89a2dfddc03cf1d7b662b311c2c2e3
2018-01-10 19:41:53 +00:00
Adam Vartanian
e1544712ff
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8
...
am: e3542ba9d1
Change-Id: I079a60c74dbe0eb39db7a8706db790fd1dde2b6f
2018-01-10 19:40:36 +00:00
Android Merger
f2b8d031ab
Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
...
am: afff62b0b9
Change-Id: I0ffdf433f50d14f9b2000eba363e5252a2b3e93d
2018-01-10 19:40:26 +00:00
Adam Vartanian
5f8387ec67
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 78f5d24a4f am: 2f42f87a5f
...
am: be7378e99b -s ours
Change-Id: If7c4dd7ea9d85ddd0bd54fb4b234418d315e5e5b
2018-01-10 19:40:23 +00:00
Adam Vartanian
ec320be2b3
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: I26d7d4dd3d6eb4ef7d91b302911b8f848dcd1931
2018-01-10 19:39:50 +00:00
Android Build Merger (Role)
2cfab2140f
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-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:39:44 +00:00
Android Merger
02489fed37
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
...
am: bfbc502b70
Change-Id: Id84bbe631bf0cd7dacec5a93096e5c3b657b0ae0
2018-01-10 19:35:37 +00:00
Adam Vartanian
43aea5638c
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: 8cb75edc3a
Change-Id: I1a2e5c168e011aa9e4b5cda1cc264293ec32e834
2018-01-10 19:34:50 +00:00
Android Merger
983bd08331
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
...
am: a463421450
Change-Id: Ib02217fd6d4741ff4273e28661658f6b25e2f687
2018-01-10 19:31:18 +00:00
Android Merger
df56d8e2d0
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
am: 293664a1fb
Change-Id: I24b0b2bff4c68f185a0ed0ef62cc00a1cf1ef185
2018-01-10 19:30:41 +00:00
Adam Vartanian
017cac1442
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d
...
am: b7279d7562
Change-Id: I1e4f6c9b0a217422b8f9b8a3d031d6f4c5c25592
2018-01-10 19:29:58 +00:00
Android Merger
b14f56b2c3
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
am: d9aadde604
Change-Id: I9a9f644d102fb0bf576806a450fcb70bfc428ddb
2018-01-10 19:29:47 +00:00
Adam Vartanian
9d37478448
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: bf44542d59
Change-Id: I0816911863c6afaef6b03ec1e8c81fa56a89664a
2018-01-10 19:29:44 +00:00
Adam Vartanian
6f4857d900
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0
...
am: c0411106a9
Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4
2018-01-10 19:29:33 +00:00
Adam Vartanian
2ff1dfc44f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: df249cbcbb -s ours
Change-Id: I805acab23406098716c465c6711a95a4845e17b6
2018-01-10 19:29:14 +00:00
Adam Vartanian
f456658884
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: d9ac06f2c2 -s ours
Change-Id: I67feb6491c120e42f274aa78e553a3127cbe475e
2018-01-10 19:28:21 +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
bfbc502b70
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
am: bc18e7e105
Change-Id: I1ea99297879174cd2b91f05408d765e705c612d4
2018-01-10 19:25:44 +00:00
Adam Vartanian
c6545ebce1
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860
...
am: d58943f9bd
Change-Id: Ie9e2f0cf91733e72e08dff48eb92434a3188f116
2018-01-10 19:24:46 +00:00