Etan Cohen
4160e25384
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
...
am: 410168a364
Change-Id: I3fd82fef086b959ebd95707bff48758e5e4a7f90
2017-10-24 18:30:01 +00:00
Etan Cohen
5b0b9f0690
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" am: eedaf74628 am: fb02e14772
...
am: 1b7972c3ad
Change-Id: I42f297ae31332ef5e430f928758a2d94d3b2c5e8
2017-10-24 18:23:23 +00: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
0c9badeec9
Merge "Add UDP encap socket test to CTS tests" am: 9b85584096 am: 59c10d21d4
...
am: 6b2dcb1981
Change-Id: I46a496a4732e6a558d5ab068d8fadb990b041ec2
2017-10-24 16:58:17 +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
93b6fc1201
Merge "Use -Werror in cts/.../Anroid.mk" am: 3012fb2ba0 am: c4e5ef0549 am: 07c17c56d6
...
am: 9905ef8518
Change-Id: Ibbc77d28e3d3d42963f10f223155a7a5e2b2dcbb
2017-10-20 23:16:15 +00: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
074beff3eb
Merge "CTS: update wifi scan timeout to 9 seconds" into oc-mr1-dev am: 9d802bdf96
...
am: 34f5d032f4
Change-Id: I29284a6ead745182b80299f40c8a2794bb7b307a
2017-10-11 16:50:58 +00: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
ecf09e273d
Merge "CtsHostsideNetworkTests: Add more logging when the test fails." into oc-mr1-dev am: e0c6f29d71
...
am: 3496ab978d
Change-Id: I942cad554e0f24406ba5c2d5d402a29ef400c817
2017-09-30 07:47:14 +00: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
502f28067d
Merge "CtsHostsideNetworkTests: Add more logging when the test fails." into oc-mr1-dev am: 26e6bf91be
...
am: 09bab7b5c3
Change-Id: Ia1f48086e6e32923458778f187c7f8c9dfaf34ca
2017-09-27 21:11:29 +00: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
e4c0c4f0cc
Merge "Ensure that Ethernet is supported if the service is running." into oc-mr1-dev am: 8c82e9fc98
...
am: 9660be6828
Change-Id: I6ef9595819da00ef7470817439939d00c4fe4286
2017-09-27 11:27:28 +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
c40627af2b
Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970 am: ace309a7ad am: 24aa40363f
...
am: 6506340c5c
Change-Id: If8183d6a77c76af1eeed39a46cc801676aae6475
2017-09-27 09:05:14 +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
Lorenzo Colitti
ace309a7ad
Merge "Ensure that Ethernet is supported if the service is running."
...
am: 266fad4970
Change-Id: I9faf940c6d36abb1b0e7b07cbb01974cdf1e9d25
2017-09-27 08:31:15 +00:00
Treehugger Robot
266fad4970
Merge "Ensure that Ethernet is supported if the service is running."
2017-09-27 08:23:34 +00:00
Lorenzo Colitti
c4f38c2e5b
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.
Bug: 37359230
Test: ConnectivityManagerTest passes on aosp_bullhead
Change-Id: I395c689e47074910fb56bbd8fc5b2d698d3893ab
2017-09-27 14:01:48 +09:00
Sudheer Shanka
f23cf00410
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: I8e04e061b949a44e6c63bc56eba9612311065a4d
2017-09-26 18:19:43 -07:00
nharold
783f59fe25
Merge "Re-Add the IpSecService Tests" am: 7432695b11 am: 8a707e0272 am: 9239df04b3
...
am: c1810b9acc
Change-Id: I47ad3a9cb2e2bd2e212b84df7af8abe343a42947
2017-09-26 22:46:35 +00:00
nharold
c1810b9acc
Merge "Re-Add the IpSecService Tests" am: 7432695b11 am: 8a707e0272
...
am: 9239df04b3
Change-Id: Ief88fda059556c0a1e94754766e3c800a390dd48
2017-09-26 22:36:47 +00:00
nharold
9239df04b3
Merge "Re-Add the IpSecService Tests" am: 7432695b11
...
am: 8a707e0272
Change-Id: Ib98a87b3a86cc74c15574a0af9fb3460273e834d
2017-09-26 22:21:42 +00:00
nharold
8a707e0272
Merge "Re-Add the IpSecService Tests"
...
am: 7432695b11
Change-Id: I5f4b69627fb54673ff4790342437c1917c9dad7a
2017-09-26 22:10:08 +00:00
nharold
7432695b11
Merge "Re-Add the IpSecService Tests"
2017-09-26 21:46:38 +00:00
Bill Yi
7981475dae
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours am: 7f71a70fd9 -s ours am: 81257a1750
...
am: d2cc39174c -s ours
Change-Id: Ieaa4b57afcb731226fec7625ff7cb4016d54f53d
2017-09-15 22:59:07 +00:00
Bill Yi
d2cc39174c
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours am: 7f71a70fd9 -s ours
...
am: 81257a1750
Change-Id: Ieaa54811613264b57bf6d6b5c3e4df7a796e1a3d
2017-09-15 22:52:50 +00:00
Bill Yi
81257a1750
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours
...
am: 7f71a70fd9 -s ours
Change-Id: I9f05351ed2accaa83b18bb425a268fad4adab49a
2017-09-15 21:16:06 +00:00