nharold
44eef0ee8d
Merge "Update testCreateTransform() for one-way transforms"
2018-01-17 08:45:29 +00:00
nharold
5810dda443
Merge "Update IpSecManagerTest for API changes to Transforms"
2018-01-17 08:40:37 +00:00
Nathan Harold
f91b5a214b
Update testCreateTransform() for one-way transforms
...
This patch augments testCreateTransform() to
selectively apply the ipSecTransform in one/both
directions and then verifies that the link succeeds or
fails correctly. In addition, this converts the test
to use the Java sockets API for DatagramSocket instead
of using the FD-based API. One of the combos does not
fail as expected, so b/72048263 is tracking further
work needed.
Bug: 72047396
Bug: 71717213
Test: cts - IpSecManagerTest
Change-Id: Ied961f442b29f1e66ded37c7ffe7afdd4a5c49da
2018-01-16 21:12:43 -08:00
Android Merger
e2201303a6
Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c"
...
* changes:
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d
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 am: 482d1b4a62 -s ours
2018-01-16 22:03:00 +00:00
Android Merger
d6a893adf4
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
...
am: 9f63146b7d
Change-Id: I9883f8b542bab40c8db4de1c8a768fd12b04a3c2
2018-01-16 22:02:49 +00:00
Adam Vartanian
c0d866facc
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
...
am: 482d1b4a62 -s ours
Change-Id: Ia18553aebf6e6306ce3e3e590ad6f2972c73a1bb
2018-01-16 21:56:40 +00:00
Android Merger
9f63146b7d
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207
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
2018-01-16 21:48:43 +00:00
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
Nathan Harold
19adaa182d
Update IpSecManagerTest for API changes to Transforms
...
API changes in IpSecManager and IpSecTransform are
reflected in these test updates: no functional change
to the test; just style updates along with improvement
in the clarity of using a single transform for both
directions.
Bug: 71717213
Test: CTS - IpSecManagerTest
Change-Id: Ia6933d010620516672687080898f8c4fd83223bc
2018-01-16 11:15:13 -08: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
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
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
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
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
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
Android Merger
c660e3c3f2
Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2"
...
* changes:
Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7
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
2018-01-10 19:56:41 +00:00
Android Merger
d813e180f6
Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
...
am: 105ca148a7
Change-Id: Iac57e88088eeb4a12c52e383c33a11a4a30adb1a
2018-01-10 19:56:14 +00:00
Adam Vartanian
2181876b7e
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: I49b152f261ea580aea41eb846ca0239520afc16f
2018-01-10 19:48:38 +00:00
Android Merger
420c69b8a1
Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c"
...
* changes:
Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f
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
2018-01-10 19:40:33 +00:00
Android Merger
ec3e88577f
Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
...
am: dedfb2ca1f
Change-Id: I7072dfc37d644226d37689f4313ecf0ea19f7c28
2018-01-10 19:40:09 +00: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
Adam Vartanian
e104b8132d
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: I9ebe0964d0cd8777cff515a9083f6c808ce2542c
2018-01-10 19:34:37 +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
7aa66922dd
Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986"
...
* changes:
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: d89f75a3db -s ours
2018-01-10 19:27:09 +00:00
Android Merger
90b129d44e
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
am: 36407c961d
Change-Id: I16ebd986d9d762b0ae6920a4bc82574156eb228a
2018-01-10 19:26:44 +00:00