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
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
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
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
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
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
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
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
2017-10-24 16:43:44 +00:00
Benedict Wong
59c10d21d4
Merge "Add UDP encap socket test to CTS tests"
...
am: 9b85584096
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
2017-10-20 22:54:33 +00:00
Chih-hung Hsieh
07c17c56d6
Merge "Use -Werror in cts/.../Anroid.mk" am: 3012fb2ba0
...
am: c4e5ef0549
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
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
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
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
2017-09-27 17:32:15 +09:00
Lorenzo Colitti
ace309a7ad
Merge "Ensure that Ethernet is supported if the service is running."
...
am: 266fad4970
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
c1810b9acc
Merge "Re-Add the IpSecService Tests" am: 7432695b11 am: 8a707e0272
...
am: 9239df04b3
2017-09-26 22:36:47 +00:00
nharold
9239df04b3
Merge "Re-Add the IpSecService Tests" am: 7432695b11
...
am: 8a707e0272
2017-09-26 22:21:42 +00:00
nharold
8a707e0272
Merge "Re-Add the IpSecService Tests"
...
am: 7432695b11
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
d2cc39174c
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours am: 7f71a70fd9 -s ours
...
am: 81257a1750
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
2017-09-15 21:16:06 +00:00
Bill Yi
7f71a70fd9
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
am: cbc75fa643
2017-09-15 21:11:07 +00:00
Bill Yi
cbc75fa643
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
Change-Id: I5a20ec8986f2bfc810cec42ca7b33310aba337a4
2017-09-15 13:55:36 -07:00
Etan Cohen
1c97094149
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b am: 507654d6ae
...
am: 310a56dcb0
2017-09-15 03:16:47 +00:00
Etan Cohen
310a56dcb0
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b
...
am: 507654d6ae
2017-09-15 02:57:02 +00:00
Etan Cohen
507654d6ae
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91"
...
am: 98792d616b
Change-Id: I1882f7e73325c4b938f22b2f7e29d203117819b9
2017-09-15 02:43:55 +00:00
Etan Cohen
04038eb317
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev
...
am: ba16d61c91
Change-Id: If02188d1840095be927a18b66296910c4ec7e387
2017-09-14 22:59:05 +00:00
Chenbo Feng
8f3f8cb7fd
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1" am: c3d81857a5 am: 6fe814f14b
...
am: a953e3229c
2017-09-14 22:54:43 +00:00
Chenbo Feng
a953e3229c
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1" am: c3d81857a5
...
am: 6fe814f14b
2017-09-14 22:35:10 +00:00
Chenbo Feng
6fe814f14b
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1"
...
am: c3d81857a5
Change-Id: Ifff65ca6a4ca26dd0bb5defac2a965952dee08fe
2017-09-14 22:23:19 +00:00
Chenbo Feng
a54608a11a
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6" am: 46acd158a2 am: 89e5b633c7
...
am: 4f23ba69d9
2017-09-14 22:22:31 +00:00
Chenbo Feng
4f23ba69d9
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6" am: 46acd158a2
...
am: 89e5b633c7
2017-09-14 22:15:39 +00:00
