Ningyuan Wang
074beff3eb
Merge "CTS: update wifi scan timeout to 9 seconds" into oc-mr1-dev am: 9d802bdf96
...
am: 34f5d032f4
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
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
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
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
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
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
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
783f59fe25
Merge "Re-Add the IpSecService Tests" am: 7432695b11 am: 8a707e0272 am: 9239df04b3
...
am: c1810b9acc
2017-09-26 22:46:35 +00: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
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
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
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
3639d7439e
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
...
am: 1c97094149
2017-09-15 12:12:09 +00:00
Chenbo Feng
564d89f410
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
...
am: 8f3f8cb7fd
2017-09-15 05:58:09 +00:00
Chenbo Feng
03f2a0ea61
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
...
am: a54608a11a
2017-09-15 05:46:56 +00:00
Chenbo Feng
0f78719a77
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69 am: 4ee9600280 am: 1b193f4735
...
am: f753028e01
2017-09-15 05:19:27 +00:00
Jeff Sharkey
242935cb85
Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev am: 91b52b4043
...
am: be3000bc35
2017-09-15 04:17:16 +00: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
Chenbo Feng
89e5b633c7
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
Change-Id: Id99b60b98e06a43c2e9ad645ee0e50b5395a8bff
2017-09-14 22:11:24 +00:00
Chenbo Feng
85de5d94bc
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
2017-09-14 21:58:00 +00:00
Chenbo Feng
880ad913b8
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
2017-09-14 21:55:29 +00:00
Chenbo Feng
f753028e01
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69 am: 4ee9600280
...
am: 1b193f4735
2017-09-14 17:49:26 +00:00
Chenbo Feng
1b193f4735
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69
...
am: 4ee9600280
2017-09-14 17:39:00 +00:00
Chenbo Feng
4ee9600280
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d"
...
am: 0fb575dc69
Change-Id: I1c5312b51f851d7a70b985a980c128622e1b68e6
2017-09-14 17:27:47 +00:00
Jeff Sharkey
be3000bc35
Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev
...
am: 91b52b4043
Change-Id: I8177cc215297566af2fb9ac206c5c425071fd3aa
2017-09-14 16:56:06 +00:00
