Commit Graph

2103 Commits

Author SHA1 Message Date
Adam Vartanian
df4e5f9902 Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev am: fb27c032ff am: 3c22d6bea8
am: bbc39aba5b

Change-Id: Ic129a3fdff54705ba345cd032a0b17ce502ac5c9
2018-02-02 03:58:55 +00:00
Adam Vartanian
bbc39aba5b Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev am: fb27c032ff
am: 3c22d6bea8

Change-Id: I2fe9d75f0bf5b94f2fa0b2d0a819f2b8281ccf7b
2018-02-02 03:32:08 +00:00
Adam Vartanian
3c22d6bea8 Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev
am: fb27c032ff

Change-Id: I459897b291fff063091f4d5e64330df4ade47c0c
2018-02-01 23:31:51 +00:00
Android Build Merger (Role)
ea75ff0609 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8 am: 330b09b8a8 am: 119bbb1cdb
Change-Id: Ib52e5a020d679328e9d91534e636f6f89abb8781
2018-01-31 11:17:54 +00:00
Android Build Merger (Role)
330b09b8a8 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8
Change-Id: I0232e8093dd78ed98e9d89ec0c062593b38a12a1
2018-01-31 11:17:45 +00:00
Android Build Merger (Role)
1e65404eb8 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136
Change-Id: I3e58d87b69ba1f32474550364e04324e6fc8fd88
2018-01-31 11:17:39 +00:00
Android Build Merger (Role)
3bc75c3136 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f
Change-Id: I164c155385cef9ca2ed8bb810d1c1e7be65e4458
2018-01-31 11:17:34 +00:00
Android Build Merger (Role)
2f52ceef6f [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c
Change-Id: Ie5d7744787cd7b700b42dc22ddc921f5b1965a01
2018-01-31 11:17:29 +00:00
Android Build Merger (Role)
67ae9d3245 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a
Change-Id: I29da2e67aa8c3ec9bde0d72c91ada85f160e39d9
2018-01-31 11:17:19 +00:00
Android Build Merger (Role)
27914625b1 [automerger] Add CTS test for URI fix. am: 85156429a2
Change-Id: Iedd07e900b8512737df2d0d6ca33920ef9bfd30b
2018-01-31 11:17:09 +00:00
Adam Vartanian
85156429a2 Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
2018-01-31 10:47:13 +00:00
Hugo Benichi
4750a2a9f8 Merge "Add CTS coverage for MacAddress" am: e264485c55
am: 5e62adab76

Change-Id: Iab010dea545323650a7d03bf14edc84c69129f81
2018-01-30 23:39:35 +00:00
Hugo Benichi
83e4cf5085 Add CTS coverage for MacAddress
Bug: 71866627
Test: cts-tradefed run cts-dev --module CtsNetTestCases -t android.net.cts.MacAddressTest
Change-Id: I2d8702b154a485f89911e1affb7cee79692f3ac7
2018-01-30 14:40:51 +09:00
nharold
dc42b714fb Merge "IpSec - API Tweak for removeTransportModeTransforms" am: 1ca0e05919
am: c1f0cbb244

Change-Id: I5ef872199f1b29b69799e82c0e5d13d87dc13711
2018-01-17 20:36:03 +00:00
nharold
1ca0e05919 Merge "IpSec - API Tweak for removeTransportModeTransforms" 2018-01-17 19:07:10 +00:00
nharold
1d9eb58067 Merge "Update testCreateTransform() for one-way transforms" am: 44eef0ee8d
am: 9715ccb8b1

Change-Id: I62f950c72cd97628656c67f12e4c17c04d925f4d
2018-01-17 09:59:45 +00:00
nharold
4267616561 Merge "Update IpSecManagerTest for API changes to Transforms" am: 5810dda443
am: ed61c2a2a2

Change-Id: I6a796c5dc019f3a1096e189e851352cc4c46c6da
2018-01-17 09:48:05 +00:00
Nathan Harold
9c590594b6 IpSec - API Tweak for removeTransportModeTransforms
Update IpSec tests to remove the transform parameter from
calls to removeTransportModeTransform(). It is infeasible
and thus removed.

Bug: 72079356
Test: cts - IpSecManagerTest
Change-Id: Iaa0b35b24bf044503da9af9966508ac5e88846e1
2018-01-17 01:07:52 -08:00
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 Build Merger (Role)
8f2ce7a2b6 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22 am: a86c42b38d
am: 20754b2e89

Change-Id: Id058b9f21bc89468698ebd028c63d08f36f735f4
2018-01-17 03:32:18 +00:00
Android Build Merger (Role)
3e27763882 [automerger] 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: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84 am: c5e57d2adf
am: 68e08c6583

Change-Id: I2c272ba81e11cf46baba232253aeb1e554f75c3d
2018-01-17 03:31:12 +00:00
Android Build Merger (Role)
20754b2e89 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22 am: a86c42b38d
Change-Id: I117259585aff22358b01358ae1f7425450851c43
2018-01-17 03:24:07 +00:00
Android Build Merger (Role)
a86c42b38d [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22
Change-Id: I5dd1f11b861143d2dd51ff6feb572550d609a1df
2018-01-17 03:24:03 +00:00
Android Build Merger (Role)
808e81dd22 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9
Change-Id: I6bc6a23c88ad0e6128fc31278f4a206a78652926
2018-01-17 03:23:56 +00:00
Android Build Merger (Role)
eac2219dc5 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e
Change-Id: I120eb44d9d2d125a39e126cb352c647957f7c3d6
2018-01-17 03:23:48 +00:00
Android Build Merger (Role)
68e08c6583 [automerger] 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: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84 am: c5e57d2adf
Change-Id: I1adf2d94f8679852e4fd8ec138dcfd4dbefdf8fa
2018-01-17 03:23:06 +00:00
Android Build Merger (Role)
c5e57d2adf [automerger] 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: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84
Change-Id: I5ad7437c1666b13a838686bd79e066671f14d7ed
2018-01-17 03:23:03 +00:00
Android Build Merger (Role)
6b4982ab84 [automerger] 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: 0929932c4e am: 265bcb72d4 skipped: 817433c874
Change-Id: I62e9a641654b924112701fb7c079d32e8c1e9f88
2018-01-17 03:22:57 +00:00
Android Build Merger (Role)
265bcb72d4 [automerger] 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: 0929932c4e
Change-Id: If961faa8b8cd48133480340db402be74a138351a
2018-01-17 03:22:50 +00:00
Android Merger
b4bfd2591e Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: I2193a17eb99173895f9397d18d8361e1eb4568d6
2018-01-17 03:22:22 +00:00
Adam Vartanian
0929932c4e 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: I08182d4ead353c8fe59d54bac007586c6fa91b1d
2018-01-17 03:19:45 +00:00
Android Build Merger (Role)
69c9751809 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa am: e477541e10
am: 234cc79182

Change-Id: I8a13377d42f369193276bd6895be6ac5593eb934
2018-01-17 02:55:13 +00:00
Android Build Merger (Role)
1d36a3ecd3 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6 am: ef964de58b am: a11e751c00
am: 62750670fe

Change-Id: I21448e25bfad1ac96fc3708225bd6f26c9e02e4b
2018-01-17 02:54:29 +00:00
Android Build Merger (Role)
234cc79182 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa am: e477541e10
Change-Id: Ie90dcc7c9cf1a960f2b18555e7071b6efe60ba30
2018-01-17 02:46:21 +00:00
Android Build Merger (Role)
e477541e10 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa
Change-Id: I86ed0a2bf7ae2ee93cca2d9da3230078e6d77255
2018-01-17 02:46:18 +00:00
Android Build Merger (Role)
94583cc2fa [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4
Change-Id: I06afa7a3a2607550bf3dcc2a7ec337c92a58fff6
2018-01-17 02:46:11 +00:00
Android Build Merger (Role)
7f4a3db8e5 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870
Change-Id: I3844fb6083799d1975c43644b66c69ec5611283e
2018-01-17 02:46:03 +00:00
Android Build Merger (Role)
b986143870 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be
Change-Id: I475e52bc05a9a602cb8d99fbf1468832686b69c0
2018-01-17 02:45:59 +00:00
Android Build Merger (Role)
af696171be [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d
Change-Id: I28da24aaf125a8ada71b760c42e03ad7bef5bfcf
2018-01-17 02:45:55 +00:00
Android Build Merger (Role)
62750670fe [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6 am: ef964de58b am: a11e751c00
Change-Id: I78fd12e8ae7a1bf78a44b1da8614e8ecd02c7131
2018-01-17 02:45:01 +00:00
Android Build Merger (Role)
a11e751c00 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6 am: ef964de58b
Change-Id: I15902a01b93d9cbf13e27fa6ef9376e943b4db5e
2018-01-17 02:44:57 +00:00
Android Build Merger (Role)
ef964de58b [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6
Change-Id: Ie98a567e52f4366e613a9470010ecc03857433b5
2018-01-17 02:44:51 +00:00
Android Build Merger (Role)
bf5ae9c33b [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02
Change-Id: I2197bc67084542f213abff49139bd333eba63484
2018-01-17 02:44:44 +00:00
Android Build Merger (Role)
16b7318a02 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f
Change-Id: I7df1041d1cd9f582534af512a99774288d41d4eb
2018-01-17 02:44:40 +00:00
Android Build Merger (Role)
a8a391899f [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23
Change-Id: I4b5d6970b199efd861d25633abd0433446ca1304
2018-01-17 02:44:37 +00:00
Android Merger
02c0ecc53d Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: f582e9dede

Change-Id: Ie9702984ab2e7a3d90ce0237d5c5593446d4b664
2018-01-17 02:44:23 +00:00
Adam Vartanian
3ba9598f23 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
am: 84a9da7ac9  -s ours

Change-Id: Ic32802e983f9a464d629873909380682f3fb2c34
2018-01-17 02:42:57 +00:00
Android Merger
89a6cd1bc2 Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c" am: e2201303a6
am: 35dfddc30b

Change-Id: I2dc64df145736fa89743ac1b4712790012f3acc9
2018-01-16 22:38:19 +00:00