Commit Graph

1725 Commits

Author SHA1 Message Date
Android Merger
58d0305cf1 Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
am: de16c72207

Change-Id: I78658a04d27b680f8863dbdc3eecf57b45087aa1
2018-01-16 21:48:33 +00:00
Adam Vartanian
482d1b4a62 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours
am: ca0bfec15d  -s ours

Change-Id: I13dbb0c257db4c763d6ccc131e0486a13e5ed21d
2018-01-16 21:44:11 +00:00
Android Merger
de16c72207 Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
* changes:
  Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours
2018-01-16 21:38:59 +00:00
Android Merger
280672fd93 Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: If3153994b6609d626af3ed58c47f33aad5cf19ec
2018-01-16 21:38:46 +00:00
Adam Vartanian
ca0bfec15d DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
am: 9dc912e515  -s ours

Change-Id: I29a2fc035147a9ab695dd8ca3e8c1dbabbb83246
2018-01-16 21:36:07 +00:00
Android Merger
5962c9a234 Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours
2018-01-16 21:32:32 +00:00
Android Merger
dca340db07 Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: f582e9dede

Change-Id: Iffcf7f437e5e438796f01dd86e9599047292cd2f
2018-01-16 21:32:21 +00:00
Adam Vartanian
9dc912e515 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
am: 84a9da7ac9  -s ours

Change-Id: Ie5f8bf09bdb80355c9eac6d5361f089411216ad5
2018-01-16 21:30:40 +00:00
Android Merger
f582e9dede Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
* changes:
  Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
am: 27e23e96ca

Change-Id: Ic1e94cf87bd0cf722ba1212ae0251d3c06f93f73
2018-01-16 21:28:30 +00:00
Adam Vartanian
84a9da7ac9 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
am: 181a10e364  -s ours

Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b
2018-01-16 21:27:42 +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
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
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
Android Merger
105ca148a7 Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9
  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
2018-01-10 19:34:45 +00:00
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