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
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
Chenbo Feng
72ea1b2420
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d
Change-Id: I705950d7d620ac21cc74c2584c0e3256f17af15e
2017-09-14 03:55:19 +00:00
Sudheer Shanka
459e28159c
Fix flaky CtsHostsideNetworkTests.
...
'set metered-network' adb command is not blocking, it doesn't
wait for the network to be marked as metered. Updated test
to sleep and poll for metered status.
Bug: 64274313
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests \
-t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ide3e1633167979bdca912c1c299ad17d988b537e
2017-09-13 18:17:01 -07:00
Nathan Harold
f304fce1fe
Re-Add the IpSecService Tests
...
This reverts commit 18b7c24177
2017-09-12 18:47:38 -07:00
Sudheer Shanka
c7779d69ab
Merge "Add extra logging when the test fails." into oc-mr1-dev
...
am: 27547e6446
2017-09-08 23:52:33 +00:00
Sudheer Shanka
27547e6446
Merge "Add extra logging when the test fails." into oc-mr1-dev
2017-09-08 23:12:44 +00:00
Sudheer Shanka
518999df34
Add extra logging when the test fails.
...
When the test fails, dump network_management and netpolicy
services to help in debugging.
Bug: 64274313
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests \
-t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I76287de2c7cd6f394af9768a69e2c0fabba3be25
2017-09-07 15:36:08 -07:00
Sudheer Shanka
bcaf1bf849
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours am: 8ca874ff80 -s ours am: 1608a09e47 -s ours
...
am: 314d003540
2017-09-07 19:05:23 +00:00
Android Build Merger (Role)
319693bce2
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours am: ad5a21d247 -s ours am: e0ebf2197b -s ours" into oc-mr1-dev-plus-aosp
2017-09-07 19:03:30 +00:00
Sudheer Shanka
459c05d27a
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours am: ad5a21d247 -s ours
...
am: e0ebf2197b
2017-09-07 19:02:10 +00:00
Sudheer Shanka
cd70b4a721
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours am: 8ca874ff80 -s ours am: 1608a09e47 -s ours
...
am: eda0e85f99
2017-09-07 19:00:48 +00:00
Android Build Merger (Role)
f7a8a679f8
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours am: 1c3be623ba -s ours" into oc-mr1-dev-plus-aosp
2017-09-07 18:57:38 +00:00
Sudheer Shanka
314d003540
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours am: 8ca874ff80 -s ours
...
am: 1608a09e47
2017-09-07 18:56:46 +00:00
Sudheer Shanka
eda0e85f99
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours am: 8ca874ff80 -s ours
...
am: 1608a09e47
2017-09-07 18:56:43 +00:00
Sudheer Shanka
4e780891d4
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours
...
am: 1c3be623ba
2017-09-07 18:56:22 +00:00
Sudheer Shanka
34c9a6a2ef
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours am: ad5a21d247 -s ours
...
am: 2cdc59452a
2017-09-07 18:54:46 +00:00
Sudheer Shanka
1608a09e47
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours
...
am: 8ca874ff80
2017-09-07 18:51:41 +00:00
Sudheer Shanka
e0ebf2197b
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours
...
am: ad5a21d247
2017-09-07 18:50:19 +00:00
Sudheer Shanka
2cdc59452a
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours
...
am: ad5a21d247
2017-09-07 18:50:12 +00:00
Sudheer Shanka
8ca874ff80
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd
...
am: c4e9bdc085 -s ours
Change-Id: I1ddc2ab2fb8c80d9455b7ee15e7fa4e929517c7a
2017-09-07 18:43:52 +00:00
Sudheer Shanka
2da1dde301
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours
...
am: adcf5350c0
2017-09-07 18:43:47 +00:00
Sudheer Shanka
ad5a21d247
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours
...
am: 384309dea0
2017-09-07 18:43:45 +00:00
