Xin Li
ab7bb84e34
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 94b8755057 -s ours
...
am: 817836d922
Change-Id: Id74502ef71ada04555e60232a32cf535d30f11af
2017-12-07 08:56:01 +00:00
Xin Li
94b8755057
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:30 +00:00
Manoj Boopathi Raj
e2309491e9
Merge "Test more transforms and more socket types." am: d292f764bd
...
am: 129129a6ad
Change-Id: I6ad35065b267b9f7549aca0d5f5b506759d6a9cb
2017-11-16 18:07:11 +00:00
Manoj Boopathi Raj
129129a6ad
Merge "Test more transforms and more socket types."
...
am: d292f764bd
Change-Id: Icdf454b74803f0bdf4f42caaccd34ec6bd72a224
2017-11-16 18:02:38 +00:00
Lorenzo Colitti
bca5ed9431
Test more transforms and more socket types.
...
Added CTS test to check the transform (for IPv4 & IPv6) with
various authentication & encryptions types
Bug: 34812052
Test: Ran CTS on angler using aosp/run_cts.sh
Change-Id: I51b4d13847ed0f8ad8d5f19132fdb35b1bd2950c
2017-11-15 14:12:31 -08:00
Xin Li
49b97c8053
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I08d90f09595783ecc235a95c3ab1b02f1bf1c21b
2017-11-14 16:42:59 -08:00
Xin Li
6e0e8f25d8
Merge commit 'ba1e9e7f7893a079138330d2962ff75c35d4cae2' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master.
Change-Id: I1172a1501c65f67b9c2829b739cadeb9e9ff1983
2017-11-14 11:40:13 -08:00
Adam Vartanian
66bf6ff3a2
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c
...
am: cd4ab882f0
Change-Id: Ib873b84dc95df60368a259ffd37401bc8bc2a6d3
2017-11-08 01:03:35 +00:00
Adam Vartanian
cd4ab882f0
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226
...
am: 2516305c8c
Change-Id: I7e7f5363c4747289c9817e58cb6636839aa2da05
2017-11-08 00:29:47 +00:00
Adam Vartanian
2516305c8c
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a
...
am: 3d7e43b226
Change-Id: I318a6c318db25c5d4dd4be3426b480a9de0b9b11
2017-11-08 00:05:43 +00:00
Adam Vartanian
3d7e43b226
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285
...
am: f259a8e37a
Change-Id: Iaf798faba75cb1f543e012eee98707e20a08e8ce
2017-11-07 23:41:55 +00:00
Adam Vartanian
83f1303285
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646
...
am: fb73667810
Change-Id: Ib6d1cc2531123894f917b13d388845164e6eec32
2017-11-07 22:56:57 +00:00
Adam Vartanian
fb73667810
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052
...
am: 2204809646
Change-Id: Ic96d9b4693178421303c45ac628c456b66cdf655
2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
...
am: 1e1de4f052
Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
...
am: e88ef1b832
Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
...
am: c210cc1a90
Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa
Add CTS test for URI fix. am: a01da8536c
...
am: b1b5379591
Change-Id: Ib1bcf1c84ee878161f812e8a9ba762a746329a3b
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591
Add CTS test for URI fix.
...
am: a01da8536c
Change-Id: I21c707648e6cc02b267f663bd02140dd66b6bd80
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c
Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Jonathan Basseri
60b9bbdda1
Merge "Use random available port in CTS tests." am: 59d9f58467
...
am: 1ffbf5accc
Change-Id: Idf5e8a928f6bdfe2e075d61ac0cf5866059ed39a
2017-10-31 18:22:26 +00:00
Jonathan Basseri
382ea38fc0
Use random available port in CTS tests.
...
Let the OS pick a random unused port so that the test never gets
EADDRINUSE.
Bug: 68657805
Test: Run tests in android.net.cts.IpSecManagerTest
Change-Id: I7f6c68f3c92f5cbed856eda52adcdffb8adc4734
2017-10-31 09:43:26 -07:00
Android Build Merger (Role)
410168a364
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b am: 66aec9074f" into oc-mr1-dev-plus-aosp
2017-10-24 18:18:22 +00:00
Etan Cohen
722df6a982
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b
...
am: 66aec9074f
Change-Id: I475225124fd5e0143bd379c6c2a463b2ac73796e
2017-10-24 18:15:44 +00:00
Etan Cohen
1b7972c3ad
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" am: eedaf74628
...
am: fb02e14772
Change-Id: I7c58480a13841513cfeec082daafc2bc4764fc83
2017-10-24 18:15:39 +00:00
Etan Cohen
fb02e14772
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0"
...
am: eedaf74628
Change-Id: Id1dd3f957f911db94c291484a0f313a7239634e8
2017-10-24 18:09:00 +00:00
Etan Cohen
66aec9074f
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc
...
am: 294f9ae45b
Change-Id: Id6806b4936ec7e3ae9bcc2ae3b62ff37b370e69b
2017-10-24 18:08:45 +00:00
Etan Cohen
294f9ae45b
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0
...
am: 8e699c86fc
Change-Id: I7860a70a1cb206f4af24441886efa2cb9512b3b5
2017-10-24 18:02:30 +00:00
Android Merger
eedaf74628
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0"
2017-10-24 17:58:16 +00:00
Etan Cohen
1b5d253694
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
...
am: d5c00ceee0
Change-Id: I0d937d53fd3c151b67d8dd263d2c5d5f7f89dd50
2017-10-24 17:57:49 +00:00
Etan Cohen
8e699c86fc
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
...
am: d5c00ceee0
Change-Id: I9b42b412355a641f2bb8a06f031fced7575bab44
2017-10-24 17:57:29 +00:00
Treehugger Robot
d5c00ceee0
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
2017-10-24 17:50:46 +00:00
Benedict Wong
6b2dcb1981
Merge "Add UDP encap socket test to CTS tests" am: 9b85584096
...
am: 59c10d21d4
Change-Id: I4bb69fe63bdcba3c92f27f0542c282b505f64dcf
2017-10-24 16:43:44 +00:00
Benedict Wong
59c10d21d4
Merge "Add UDP encap socket test to CTS tests"
...
am: 9b85584096
Change-Id: Ic819770bb02cfc08018068ad43b05dc39aa0e170
2017-10-24 16:38:42 +00:00
Benedict Wong
9b85584096
Merge "Add UDP encap socket test to CTS tests"
2017-10-24 16:31:12 +00:00
Etan Cohen
591518f378
[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network
...
Before calling the testAddPasspointConfigWithCertCredential
we need to check number of network already present in device
Bug: 67630919
Test: android.server.cts.CtsNetTestCases, WifiManagerTest
Change-Id: If643ab7bde760a65e9a5b1e9d47af53378a178fd
2017-10-23 23:07:59 +00:00
Benedict Wong
d777ed231c
Add UDP encap socket test to CTS tests
...
Tests basic functionality of UDP encap sockets:
> Creates SPIs
> Creates & applies transforms
> Creates UDP encap socket
> Ensures UDP encap socket port is non-zero
> Validates that ESP, IKE packets can be sent correctly
Test: Ran on aosp_angler-eng
Bug: 67662580
Change-Id: Ia7eca384cd779e663d53cbede97ec70da33d28ec
2017-10-23 15:59:09 -07:00
Chih-hung Hsieh
9905ef8518
Merge "Use -Werror in cts/.../Anroid.mk" am: 3012fb2ba0 am: c4e5ef0549
...
am: 07c17c56d6
Change-Id: Ie8ccfeb1c924aaa16c6c63cabea7609ec0946082
2017-10-20 22:54:33 +00:00
Chih-hung Hsieh
07c17c56d6
Merge "Use -Werror in cts/.../Anroid.mk" am: 3012fb2ba0
...
am: c4e5ef0549
Change-Id: Ife6fc1f5f1ebfd0a956bfa6564cb709898cdc52b
2017-10-20 22:48:21 +00:00
Chih-hung Hsieh
c4e5ef0549
Merge "Use -Werror in cts/.../Anroid.mk"
...
am: 3012fb2ba0
Change-Id: I9745c0cbef7ad12f950a5a68a45bf691776fb5ed
2017-10-20 22:42:31 +00:00
Chih-Hung Hsieh
78061072b6
Use -Werror in cts/.../Anroid.mk
...
* Suppress existing warnings.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ic599c9e11ea4f991b7e60930c891a6d736623b39
2017-10-18 16:55:15 -07:00
Ningyuan Wang
34f5d032f4
Merge "CTS: update wifi scan timeout to 9 seconds" into oc-mr1-dev
...
am: 9d802bdf96
Change-Id: I63e93684c0ce201c445cd1dd2ebb8f41b1afa04d
2017-10-11 16:46:49 +00:00
Ningyuan Wang
8666bc8c23
CTS: update wifi scan timeout to 9 seconds
...
This creates a new timeout constant for scan duration, so
this test doesn't share timeout constant with other events.
This also increases the scan timeout time to 9 seconds per
our estimation.
Bug: 67462981
Test: cts-tradefed run cts -m CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest#testWifiScanTimestamp
Change-Id: I7e1dea64bc8df3e4b31adbf8b5f05c8564a739b1
2017-10-10 13:26:34 -07:00
Sudheer Shanka
3496ab978d
Merge "CtsHostsideNetworkTests: Add more logging when the test fails." into oc-mr1-dev
...
am: e0c6f29d71
Change-Id: Id7704abf409f4338061c86f9cc5c67e356b0f2e9
2017-09-30 07:40:06 +00:00
Sudheer Shanka
21163bc32d
CtsHostsideNetworkTests: Add more logging when the test fails.
...
Bug: 66015813
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I1dc0603011522f73c63dcb7f0f1422428f727fad
2017-09-29 17:13:32 -07:00
Sudheer Shanka
09bab7b5c3
Merge "CtsHostsideNetworkTests: Add more logging when the test fails." into oc-mr1-dev
...
am: 26e6bf91be
Change-Id: Ibf3ea26a55abdb2a6f5340e74cc11dbef05e31f1
2017-09-27 21:07:19 +00:00
Sudheer Shanka
26e6bf91be
Merge "CtsHostsideNetworkTests: Add more logging when the test fails." into oc-mr1-dev
2017-09-27 21:00:54 +00:00
Lorenzo Colitti
9660be6828
Merge "Ensure that Ethernet is supported if the service is running." into oc-mr1-dev
...
am: 8c82e9fc98
Change-Id: I0f14fcb228e4433dc01559a28060c26377daa2a6
2017-09-27 11:19:43 +00:00
Lorenzo Colitti
6506340c5c
Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970 am: ace309a7ad
...
am: 24aa40363f
Change-Id: I85f9670815289a3c11adf159107f05619899d0da
2017-09-27 08:49:59 +00:00
Lorenzo Colitti
24aa40363f
Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970
...
am: ace309a7ad
Change-Id: I6a1e8364c3e0801cf75e13920606ec04a1054e12
2017-09-27 08:39:18 +00:00
Lorenzo Colitti
b47b977afa
Ensure that Ethernet is supported if the service is running.
...
Currently, it's possible for isNetworkSupported() to return false
for TYPE_ETHERNET even if the device could otherwise support
Ethernet (e.g., via a USB host adapter). This can lead to APIs
APIs such as getActiveNetworkInfo and CONNECTIVITY_ACTION
behaving as if Ethernet was not present, even if it's connected.
Reduce the chance of this sort of misconfiguration by ensuring
that if the Ethernet service is running, isNetworkSupported
will return true for TYPE_ETHERNET. OEMs that would like the
function to return false should avoid starting the Ethernet
service.
(cherry picked from commit c4f38c2e5b )
Bug: 37359230
Test: ConnectivityManagerTest passes on aosp_bullhead
Change-Id: Iad8884bf7d12bbf661e5502b31f052a6e8457a6f
Merged-In: Iad8884bf7d12bbf661e5502b31f052a6e8457a6f
2017-09-27 17:32:15 +09:00