Android Merger
a483aa57bc
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
...
am: d1f18aeba3
Change-Id: I2610da3036eedc3f748f6e0935bca336fb89fc0b
2018-01-13 00:49:32 +00:00
Adam Vartanian
c5079909e4
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
...
am: 50ec90be8d -s ours
Change-Id: Icbd26abefd92d483a221ee527ceec1dd4ea34e41
2018-01-13 00:48:16 +00:00
Android Merger
d5157ff6b3
Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
...
am: 105ca148a7
Change-Id: Ied32436daf608f10780ebed67465bed541bbfe8e
2018-01-13 00:27:20 +00:00
Adam Vartanian
c7df0d341d
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
...
am: 39127a559b -s ours
Change-Id: I08a4c4ddb03510cfde3bb478bb41a051bc553059
2018-01-13 00:25:30 +00:00
Android Merger
bbe1065cc8
Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
...
am: dedfb2ca1f
Change-Id: I5d7e0f0a8b8c2596e0e70b5b1fb847ea100fec44
2018-01-13 00:17:39 +00:00
Adam Vartanian
05f547c34f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours
...
am: cebea26b62 -s ours
Change-Id: I539adb80bac59928a37449ec6e81137ec78dd2f8
2018-01-13 00:15:51 +00:00
Android Merger
299f737297
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
am: 36407c961d
Change-Id: I176a7a6298802e8f837bfb2eccfe4e8427907169
2018-01-13 00:09:25 +00:00
Adam Vartanian
ce8c8029db
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
...
am: d89f75a3db -s ours
Change-Id: I556b7871c6336c76c15559540534fee5016128f3
2018-01-13 00:08:36 +00:00
Alex Vakulenko
cf9ee25695
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb
...
am: 8324e947c3
Change-Id: Ie74187a985dcfa543e1ccd489cf5019d1a46db9e
2018-01-12 00:23:34 +00:00
Alex Vakulenko
8324e947c3
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071
...
am: 5a35f88cbb
Change-Id: Id3ca47b04227c1a5425eb156095a387f4cced06a
2018-01-12 00:17:04 +00:00
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
30ef978202
Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a am: db64de57e0
...
am: 324e609466
Change-Id: I2a5755043a4a3c81317e656b0cb4ac1d763fbed3
2018-01-11 23:09:13 +00:00
Adam Vartanian
3746042fc5
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: ad0b72a35f
...
am: 47f89788d7
Change-Id: I339aa2297ccd7bad2811ec21a4bbe62d7d2fcf1d
2018-01-11 23:07:05 +00:00
Adam Vartanian
324e609466
Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a
...
am: db64de57e0
Change-Id: I10da440bcd3160bbef588aa34bea68f030f10cc3
2018-01-11 23:02:46 +00:00
Adam Vartanian
47f89788d7
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
...
am: ad0b72a35f
Change-Id: I05c2d8d1f16fd20991d72765fd960695c40e4fcf
2018-01-11 22:59:35 +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
Android Merger
d1f18aeba3
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
2018-01-11 22:49:57 +00:00
Adam Vartanian
6f17d12ef2
Merge changes from topic "m" into oreo-cts-dev
...
am: f40fcd461a
Change-Id: I6e655eb47f304d5d7eccbd20a68dd57a4b25cc95
2018-01-11 22:49:26 +00:00
Adam Vartanian
50ec90be8d
DO NOT MERGE Add CTS test for URI fix.
...
am: a02bbf31c4 -s ours
Change-Id: Ia1abdeb4be51aa8cfd7c4b15cba878887f2b539e
2018-01-11 22:49:06 +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
bca7ba675c
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 am: 4ccdfd28cf
...
am: 26bea30c7a
Change-Id: Ic8b5548cb9e283070627f423602dbccf75ea12fb
2018-01-10 21:46:48 +00:00
Adam Vartanian
32f35ba810
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 am: 0f7b85edfa
...
am: 48cde7b920
Change-Id: Ie39124290ae1423cb15022fb4a708929e9258bf1
2018-01-10 21:44:22 +00:00
Adam Vartanian
26bea30c7a
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
...
am: 4ccdfd28cf
Change-Id: Ib2932f53b800efe70498bfe8a001eae3427dfded
2018-01-10 21:35:52 +00:00
Adam Vartanian
48cde7b920
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
...
am: 0f7b85edfa
Change-Id: I5ad97178643f1e5cf3df8e2a387e7cffdbb04e6d
2018-01-10 21:33:14 +00:00
Android Merger
8aae042e7a
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd am: 5722d0a4ec
...
am: 4d17676ff1
Change-Id: Ic8aa74bf826f79bbb83b3b1b605d246c3dd1cc2c
2018-01-10 21:30:43 +00:00
Adam Vartanian
8c34694796
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 am: 6dc8d5cc2f
...
am: b4f3cd6459
Change-Id: I0be62d50b6930bc73fbdf7f7858227e650ffea3f
2018-01-10 21:28:21 +00: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 Build Merger (Role)
daeb3054b5
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f am: bd14f4f4ff am: d82562eb66
...
am: 1087e79202
Change-Id: I7318caa64b57215fcaa4d62990b9f24e9b5ad002
2018-01-10 21:21:41 +00:00
Android Merger
4d17676ff1
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd
...
am: 5722d0a4ec
Change-Id: I04deea642cc4cea202436223c407f84683bf2361
2018-01-10 21:17:35 +00:00
Adam Vartanian
a3df139cc7
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8 am: 09a3a15afe am: a69195c421
...
am: 589663cb1f
Change-Id: Ib1a0e60c2271243837ff4bb5a673a5bdbb3cf587
2018-01-10 21:16:55 +00:00
Adam Vartanian
b4f3cd6459
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
...
am: 6dc8d5cc2f
Change-Id: I06b6dcbf1393077c67f75979b51bd95cd834a773
2018-01-10 21:15:03 +00:00
Adam Vartanian
0fc0967340
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 am: 6329a0e2ae
...
am: 7666fbb478
Change-Id: I5922270f1b0bd300db1bbe874574a580766a1a8b
2018-01-10 21:14:14 +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
Android Build Merger (Role)
1087e79202
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f am: bd14f4f4ff
...
am: d82562eb66
Change-Id: I6557e64522cc303971d8adfa5e2261fb89e1176a
2018-01-10 20:40:02 +00:00
Android Merger
7edafe88ad
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27
...
am: 7071758bd8
Change-Id: I72ec5e42fc9567cb1d752843a836ae3a63768d4a
2018-01-10 20:39:44 +00:00
Adam Vartanian
fe6272b12e
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 am: 9dcd9abb3e
...
am: b33a9da44e
Change-Id: I600432be7175660b15ca534d37a8f6d74e0ca947
2018-01-10 20:37:02 +00:00
Adam Vartanian
589663cb1f
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8 am: 09a3a15afe
...
am: a69195c421
Change-Id: Ibf9e2d0d2100e3636ef3b837c36eef18143efac4
2018-01-10 20:34:21 +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
Adam Vartanian
7666fbb478
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
...
am: 6329a0e2ae
Change-Id: Id9c6293718ad177e0c908df27a554c9f82f3b360
2018-01-10 20:32:02 +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
Android Merger
7071758bd8
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d
...
am: a88a1fed27
Change-Id: I309be2935d5001a107507a36adff25d97c6c5a8c
2018-01-10 20:25:40 +00:00
Android Build Merger (Role)
09f933b601
Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a
...
am: 5af7a7290f
Change-Id: I49efdb80338f5a1638e4a147d33c73892ddff957
2018-01-10 20:25:34 +00:00