Android Build Merger (Role)
8b3cecef9a
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49 am: 464b0360d7 am: ff85bd8167 skipped: a293dfe711 am: 4f6dffda1d am: 267c79976c
...
Change-Id: I20767cf2f8b8f73720285d2716ad444dd0ea4371
2018-01-16 21:43:40 +00:00
Android Build Merger (Role)
267c79976c
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49 am: 464b0360d7 am: ff85bd8167 skipped: a293dfe711 am: 4f6dffda1d
...
Change-Id: Id9de44aa722aa75f21c26d71a2e33db1a934aee6
2018-01-16 21:43:37 +00:00
Android Build Merger (Role)
4f6dffda1d
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49 am: 464b0360d7 am: ff85bd8167 skipped: a293dfe711
...
Change-Id: Ia69b9364862014ea59f8001f1b8e19fc912dc279
2018-01-16 21:43:32 +00:00
Android Build Merger (Role)
ff85bd8167
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49 am: 464b0360d7
...
Change-Id: I401ba8a95fd1307e3472595f88e67436bbdaf75a
2018-01-16 21:43:25 +00:00
Android Build Merger (Role)
464b0360d7
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49
...
Change-Id: I0444212f97b92755ef9f52f973e4dd2fde494d04
2018-01-16 21:43:22 +00:00
Android Build Merger (Role)
d504634c49
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9
...
Change-Id: Ice6945e3f3c9910922c8bc6c61cb1e9f2aba647c
2018-01-16 21:43:19 +00:00
Android Build Merger (Role)
b9a731a6c9
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1
...
Change-Id: I5d3d4f63359eec49e4d57613ff6c7c77d7377d6e
2018-01-16 21:43:15 +00:00
Android Merger
9292b1dc41
Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev
...
am: 803a8520c2
Change-Id: Ib287baa3d94d6f5429753d4d562cf63c94405df6
2018-01-13 00:56:27 +00:00
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
Android Merger
edf8250d28
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca am: 326fcb43e5
...
am: e98d4f9f59
Change-Id: I8c851ce455f33edf9b949769c409f9484d905500
2018-01-12 00:17:09 +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
Adam Vartanian
eb712f2808
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 18e3114317
...
am: b7a93eb721
Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d
2018-01-12 00:16:34 +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
Android Merger
326fcb43e5
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
Change-Id: I6426e42847ee1f039deeea78380525fb2ef4344a
2018-01-12 00:08:17 +00:00
Android Merger
803a8520c2
Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev
2018-01-12 00:07:48 +00:00
Alex Vakulenko
daf2e786d2
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
...
am: 9992c29071
Change-Id: I5ea0bd658d11252b1c32cab7bedd1bfac8e80b26
2018-01-12 00:07:41 +00:00
Adam Vartanian
18e3114317
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
...
am: 181a10e364 -s ours
Change-Id: I02d9a3e66d85372055c4f29a54fad3679cece053
2018-01-12 00:07:35 +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
Android Merger
27e23e96ca
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
* changes:
Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
2018-01-11 23:56:54 +00:00
Adam Vartanian
b0ba87dd9b
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
am: ba3927948d
Change-Id: I71f9c4d293a0913b3274b070a6ed50c4731ab1b1
2018-01-11 23:56:45 +00:00
Adam Vartanian
181a10e364
DO NOT MERGE Add CTS test for URI fix.
...
am: 36c5e0d87f -s ours
Change-Id: I3f40aa91536bde04f153c3f0d6c218b556d40238
2018-01-11 23:56:40 +00:00
Treehugger Robot
ba3927948d
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-11 23:52:44 +00:00
Adam Vartanian
36c5e0d87f
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-11 15:18:47 -08: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