Android Build Merger (Role)
29bcde5f0b
Merge "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" into oc-mr1-dev
...
am: 4b266ee8c6
Change-Id: Ie7b3fdb0dac274bd0be177feb62dfbfc0da9159e
2018-01-13 02:30:35 +00:00
Android Build Merger (Role)
09a39d61bd
Merge "Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3" into oc-mr1-dev
...
am: 51ac8fbe5a
Change-Id: If8e8b4d297ea849f58ba95841021993bb441b171
2018-01-13 02:07:36 +00:00
Android Build Merger (Role)
4c34517ed3
Merge "DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours" into oc-mr1-dev
...
am: e0dd5c34bb
Change-Id: I8dd8ba3804c07aa27637aec2e24692d007f39554
2018-01-13 02:01:24 +00:00
Android Build Merger (Role)
91356a44cc
Merge "Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7" into oc-mr1-dev
...
am: d26e73127a
Change-Id: Ic2d313561783adfd7065529b0e2864c267083bd3
2018-01-13 01:09:14 +00:00
Android Build Merger (Role)
5615358c4f
Merge "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" into oc-mr1-dev
...
am: e06726e055
Change-Id: I2a5e0a669ed6b3934f4869038e54ee34dba1711f
2018-01-13 01:01:01 +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 Build Merger (Role)
24c1aaf9f5
Merge "Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f" into oc-mr1-dev
...
am: 43be77a8f3
Change-Id: Ib3a8a6922ab3b3547d12db93758857492d3d3e63
2018-01-13 00:41:09 +00:00
Android Build Merger (Role)
8889bedf05
Merge "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" into oc-mr1-dev
...
am: 3cfa3d6076
Change-Id: Id4cdcfd6487b888a8f49c513aa0cc47a07a8cf06
2018-01-13 00:33:03 +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
438c8d87ba
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
...
am: 299f737297
Change-Id: I98a5e632e09cac1940bc18b1bc26309c35640f93
2018-01-13 00:23:17 +00:00
Adam Vartanian
0cc76f212b
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: d89f75a3db -s ours
...
am: ce8c8029db
Change-Id: I9878eb189a75d1ec55464f434d4ed57b2330a7f1
2018-01-13 00:18:47 +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
Android Merger
921d7f97f9
Merge "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" am: 93dcd95b8b
...
am: ee062ddb20
Change-Id: I01ca5f9031843320dde94e6d22973a446423faa7
2018-01-12 00:48:17 +00:00
Alex Vakulenko
532d9e9f29
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb am: 8324e947c3
...
am: cf9ee25695
Change-Id: I471d0a7d7c616fdfe792d05ad63762da941dbb36
2018-01-12 00:28:38 +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
38d8d81212
Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b" am: 7898d269e2
...
am: 9b40813361
Change-Id: I80dd1fb1ace8d0fb26597957926e4de58b288615
2018-01-12 00:21:49 +00:00
Adam Vartanian
b59215308a
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours am: d5544e43e2 -s ours
...
am: 16488117dc
Change-Id: Iad1dd95c87dd38c8162c07f894245410890d1949
2018-01-12 00:18:44 +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
Android Merger
93dcd95b8b
Merge "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"
2018-01-12 00:12:15 +00:00
Android Merger
eeef276826
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: I2feea16764dc7844a083e16df3e401b5158c11df
2018-01-12 00:12:10 +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
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
8c7a6a49d9
Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a am: db64de57e0 am: 324e609466
...
am: 30ef978202
Change-Id: I77e27414e6e074d10c1a77527065c91284075c6c
2018-01-11 23:14:40 +00:00
Adam Vartanian
d312f113cd
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: ad0b72a35f am: 47f89788d7
...
am: 3746042fc5
Change-Id: Iedcf2ec07bbee9d18a64e6dbd4c6948480df76fc
2018-01-11 23:11:02 +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
Android Merger
7898d269e2
Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b"
...
* changes:
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours
2018-01-11 23:00:21 +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
Android Merger
57102570f9
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
...
am: d1f18aeba3
Change-Id: I7e821c20149cd8ee205cac778b7cbb3e9328208f
2018-01-11 22:59:34 +00:00
Adam Vartanian
d5544e43e2
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
...
am: 50ec90be8d -s ours
Change-Id: Ifcf62d3d2b4e46734419677980da68bcaf9c6f45
2018-01-11 22:56:22 +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
Chenbo Feng
9e998c4312
Merge "Check kernel version before running qtaguid test" am: 3b38b58b1f
...
am: 6563bb9f75
Change-Id: I59ce2ab48b525e6fd6328bb259fe6b720b500925
2018-01-11 21:33:11 +00:00
Treehugger Robot
3b38b58b1f
Merge "Check kernel version before running qtaguid test"
2018-01-11 21:18:47 +00:00
Chenbo Feng
3a9e2dc232
Check kernel version before running qtaguid test
...
The qtaguid module is required for devices running kernel earlier then
4.9, but is no longer avaliable after that. Add a check before running
the kernel qtaguid native test so it doesn't fail on new devices.
Bug: 30950746
Test: run cts -m CtsNativeNetTestCases
Change-Id: I32bc77a4c51d8b64ac1a5411c75c56a51b84ea77
2018-01-11 11:15:06 -08: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
c9b54a0300
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
...
am: bca7ba675c
Change-Id: I1aeef2900025290bc66e77fd776c8f2a1800eacb
2018-01-10 21:56:20 +00:00