Commit Graph

29083 Commits

Author SHA1 Message Date
Lorenzo Colitti
2f329557bd Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057280

Change-Id: I197cb49c4f4515fd652ee1056120abf01088ed56
2021-06-22 23:29:53 +00:00
Lucas Lin
22d513f17b Add CTS for systemReady() & getIpSecNetIdRange() am: 03a1a97bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14185507

Change-Id: Ib2f17932bd37c65bc693ae06aa2af53d82a9e920
2021-06-22 23:29:51 +00:00
Lucas Lin
c948e1e561 Call ConnectivitySettingsUtils to set/get private DNS related settings am: 611bc021e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14728963

Change-Id: I00d62fe6df6b229050de2cd5dfbad28aa843923d
2021-06-22 23:29:48 +00:00
Lucas Lin
a42cb345fc Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks am: 77cb456671
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057281

Change-Id: Ic269ff69cda4d9c340ad66530a5987b0c79bde02
2021-06-22 23:29:46 +00:00
Paul Hu
eff0815504 Add test for CSM#[get|set]MobileDataPreferredUids am: e4a2abad44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057278

Change-Id: I9afce730c6748f9d90263e3e2087b6be7b982262
2021-06-22 23:29:44 +00:00
Treehugger Robot
58b926dc3d Add test for setHttpProxyConfiguration am: 34c8be9ac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057277

Change-Id: Ic340a982573775b663dae427dee20bcb9d15f6ae
2021-06-22 23:29:42 +00:00
Aaron Huang
c129f703af CTS test for PacProxyManager am: 1eb05790a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044628

Change-Id: Icbaa52b423f9472b95852d5f12c60e50b82331fd
2021-06-22 23:29:39 +00:00
Chiachang Wang
122ffec057 Add test for CM#setAcceptUnvalidated am: 1981466747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057289

Change-Id: If5696613a1dcee18dd6c46fd5469f31f92f48194
2021-06-22 23:29:37 +00:00
Chiachang Wang
efd3529957 Add test for CM#setAcceptPartialConnectivity am: b9c9e07fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057288

Change-Id: I9d537261dad7cfee3dd2405a68ef965d25046c5e
2021-06-22 23:29:35 +00:00
Treehugger Robot
9efcf648b4 Skip CaptivePortalTest for wearables am: ecad16cf28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057282

Change-Id: Id05181a78898e9ea081ee9f9d309dced6f37a314
2021-06-22 23:29:33 +00:00
Treehugger Robot
a7f700db74 Improve handling of invalid private DNS settings am: 4a15140077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057279

Change-Id: Ia40a4a43c5d9df8f3974d0fc079a8067cf0a35d9
2021-06-22 23:29:29 +00:00
Lorenzo Colitti
77fb999ed0 Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev
* changes:
  Use assertEquals instead of assertTrue to compare the vpn type
  Add CTS for systemReady() & getIpSecNetIdRange()
  Call ConnectivitySettingsUtils to set/get private DNS related settings
  Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks
  Add test for CSM#[get|set]MobileDataPreferredUids
  Add test for setHttpProxyConfiguration
  CTS test for PacProxyManager
  Add test for CM#setAcceptUnvalidated
  Add test for CM#setAcceptPartialConnectivity
  Skip CaptivePortalTest for wearables
  Improve handling of invalid private DNS settings
2021-06-22 22:53:26 +00:00
Treehugger Robot
b502c907d9 Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276

Change-Id: I2df700fcadf39e2e6f540397d80cf0f6c6b960a8
2021-06-22 11:39:25 +00:00
Remi NGUYEN VAN
f9678d1008 Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374

Change-Id: I99ef58f523c1160e32911b56842202e0657f4015
2021-06-22 10:12:03 +00:00
James Mattis
1bd9423329 CTS tests for setOemNetworkPreference am: 904351cdcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054373

Change-Id: I32e8c57466997ff95c6251552ddb00d5e54d19f4
2021-06-22 10:12:00 +00:00
Treehugger Robot
3750a9f12e Add a test for ConnectivityFrameworkInitializer
The test verifies that system services were registered, meaning that
ConnectivityFrameworkInitializer.registerServiceWrappers ran
successfully on startup, and that calling it afterwards throws.

Bug: 171540887
Test: atest ConnectivityFrameworkInitializerTest
Original-Change: https://android-review.googlesource.com/1675598
Merged-In: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
Change-Id: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
2021-06-22 09:31:14 +00:00
Lucas Lin
da2a7c3daa Use assertEquals instead of assertTrue to compare the vpn type
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1739093
Merged-In: I55371fabe0d2fa32a71520af11f18f1eeea31460
Change-Id: I55371fabe0d2fa32a71520af11f18f1eeea31460
2021-06-22 09:24:49 +00:00
Lucas Lin
03a1a97bf9 Add CTS for systemReady() & getIpSecNetIdRange()
Bug: 182963354
Test: 1. atest CtsNetTestCases:ConnectivityManagerTest
      2. atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1676425
Merged-In: I0b286f32389501402e552010546c62f3e56833d6
Change-Id: I0b286f32389501402e552010546c62f3e56833d6
2021-06-22 09:24:44 +00:00
Lucas Lin
611bc021e6 Call ConnectivitySettingsUtils to set/get private DNS related settings
ConnectivitySettingsManager and CtsNetUtils are doing the same
thing to set/get private DNS related settings.
To prevent making the duplication code in two places, move the
body to frameworks/libs/net and call it.

Bug: 185311744
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Original-Change: https://android-review.googlesource.com/1719017
Merged-In: I3272c825b86ec30c3d0bf4097088c653e668461b
Change-Id: I3272c825b86ec30c3d0bf4097088c653e668461b
2021-06-22 09:24:37 +00:00
Lucas Lin
77cb456671 Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks
BYPASS_INCLUSIVE_LANGUAGE_REASON=To make the change more clear,
fix the inclusive problem in a follow-up commit.
Bug: 176289731
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Original-Change: https://android-review.googlesource.com/1737395
Merged-In: Ie6bda8570979b10a28dbeb20f6db7a9c44735964
Change-Id: Ie6bda8570979b10a28dbeb20f6db7a9c44735964
2021-06-22 09:24:30 +00:00
Paul Hu
e4a2abad44 Add test for CSM#[get|set]MobileDataPreferredUids
Bug: 171872461
Test: atest ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1736504
Merged-In: I43dfb049c271602526fa3e89ebb91219c7785a21
Change-Id: I43dfb049c271602526fa3e89ebb91219c7785a21
2021-06-22 09:24:24 +00:00
Treehugger Robot
34c8be9ac7 Add test for setHttpProxyConfiguration
The test verifies that system properties are set as expected by the
method.

Bug: 174436414
Test: atest ProxyTest
Original-Change: https://android-review.googlesource.com/1564956
Merged-In: Id15909c5e52f1042d7210cf7e416874bb01baee7
Change-Id: Id15909c5e52f1042d7210cf7e416874bb01baee7
2021-06-22 09:24:19 +00:00
Aaron Huang
1eb05790a2 CTS test for PacProxyManager
Bug: 181745786
Test: build CtsNetTestCases pass
      CtsNetTestCases:PacProxyManagerTest
      CtsNetTestCases:CaptivePortalTest
Original-Change: https://android-review.googlesource.com/1705131
Merged-In: I88cf3ecac12f4e8726d95a9b051e83eb719b0702
Change-Id: I88cf3ecac12f4e8726d95a9b051e83eb719b0702
2021-06-22 09:24:13 +00:00
Chiachang Wang
1981466747 Add test for CM#setAcceptUnvalidated
The always bit is verified in NetworkAgentTest. There is no easy
configuration to set an explicitly selected network to accept an
unvalidated network. Verify the accepted case also in
NetworkAgentTest.

Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Original-Change: https://android-review.googlesource.com/1731234
Merged-In: I803eb975fb0b6c52d55b2310293bcad407d21f42
Change-Id: I803eb975fb0b6c52d55b2310293bcad407d21f42
2021-06-22 09:24:07 +00:00
Chiachang Wang
b9c9e07fe2 Add test for CM#setAcceptPartialConnectivity
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Original-Change: https://android-review.googlesource.com/1730545
Merged-In: Iba312defb6f02896eac518d71d36f1ef3df3d00b
Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b
2021-06-22 09:24:01 +00:00
Treehugger Robot
ecad16cf28 Skip CaptivePortalTest for wearables
Watch devices do not support Captive Portal connection

Bug: 189540750

Original-Change: https://android-review.googlesource.com/1727591
Merged-In: Iaf1a799d0cda1d7156fedcdab34184a52f351fbf
Change-Id: Iaf1a799d0cda1d7156fedcdab34184a52f351fbf
Test: run cts -m CtsNetTestCases -t android.net.cts.CaptivePortalTest#testCaptivePortalIsNotDefaultNetwork
2021-06-22 09:23:55 +00:00
Treehugger Robot
4a15140077 Improve handling of invalid private DNS settings
When private DNS mode is strict, there should always be a private DNS
specifier with the hostname.

Instead of restoring an invalid strict mode setting when set,
have tests reset private DNS mode to opportunistic and fail.

Bug: 190465704
Test: atest CtsNetTestCases
Original-Change: https://android-review.googlesource.com/1730543
Merged-In: I45adc527267aa86d52e824f426699c5a7e874f63
Change-Id: I45adc527267aa86d52e824f426699c5a7e874f63
2021-06-22 09:23:49 +00:00
Remi NGUYEN VAN
77fdd31db1 Merge changes I49e5a99f,Ia3e4b336 into sc-dev
* changes:
  Updating timeout for Per-App CTS
  CTS tests for setOemNetworkPreference
2021-06-22 08:59:27 +00:00
Mark Chien
05e41ef67a Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057271

Change-Id: I734d263bd923bb62d7555cc264f83d70a558a72c
2021-06-22 07:58:26 +00:00
Mark Chien
07584931b5 Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev 2021-06-22 07:34:35 +00:00
Lorenzo Colitti
1aea6ea321 Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044629

Change-Id: I980645261d72ea068739c235988417c277fb8bf5
2021-06-22 04:51:18 +00:00
markchien
4dbb985d40 Allow to use ncm function for usb tethering am: 67bf9b5654
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14782684

Change-Id: Ib8212ebcf5d6616b244e1dba65c9a16be2505302
2021-06-22 04:51:16 +00:00
Lorenzo Colitti
6cea6edc9c Merge changes I270ff43c,Ifc7eee24 into sc-dev
* changes:
  Add enable and disable ip serving common functions
  Allow to use ncm function for usb tethering
2021-06-22 04:31:09 +00:00
Mark Chien
2d36831a38 Disable tryCell when UpstreamMonitor stop
tryCell configuration would not be force disabled UpstreamMonitor stop.
If tethering stop with using mobile upstream and swap with SIM fron no
dun to dun supported, dun request would be filed even tethering is not
active.

Bug: 173068192
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1715791
Merged-In: I5505655f52da9fdca2fd43a58e043a9ab727741d
Change-Id: I5505655f52da9fdca2fd43a58e043a9ab727741d
2021-06-22 03:17:53 +00:00
markchien
076ad01a4a Add enable and disable ip serving common functions
This is a op CL which prepare for refactor.

Bug: 185649441
Bug: 189410000
Bug: 178116595

Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1730548
Merged-In: I270ff43c01736b9d18bd40a8e88e1379e9e4e863
Change-Id: I270ff43c01736b9d18bd40a8e88e1379e9e4e863
2021-06-22 11:04:02 +08:00
markchien
67bf9b5654 Allow to use ncm function for usb tethering
Adding the configuration to decide using rndis or ncm for usb tethering.
If ncm is configured for TETHEIRNG_USB, then TETHERING_NCM is not
available.

Bug: 162920185
Test: atest TetheringTests
      manul testing usb tethering
Original-Change: https://android-review.googlesource.com/1730541
Merged-In: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
Change-Id: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
2021-06-22 11:03:11 +08:00
James Mattis
17a96282f0 Updating timeout for Per-App CTS
Increasing the timeout values for waiting for callbacks for the per-app
CTS tests to match the timeout value used in the waitForAvailable()
helper method.

Bug: 191230288
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest

Original-Change: https://android-review.googlesource.com/1736927
Merged-in: I49e5a99f18a5651370e6914f30be659134b537ff
Change-Id: I49e5a99f18a5651370e6914f30be659134b537ff
2021-06-21 13:53:27 -07:00
James Mattis
904351cdcf CTS tests for setOemNetworkPreference
CTS tests to validate the setOemNetworkPreference API on
ConnectivityManager. Additionally, a small bit of cleanup for
assumptions around the Wi-Fi feature.

Bug: 176496580
Bug: 176494815
Test: atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestPref --iterations
atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestOnlyPref --iterations

Original-Change: https://android-review.googlesource.com/1665079
Merged-in: Ia3e4b336123b60f6df1582aca2979129112afedc
Change-Id: Ia3e4b336123b60f6df1582aca2979129112afedc
2021-06-21 13:51:07 -07:00
Sudheer Shanka
5dd74098fa Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587

Change-Id: I3225993e2ac623c991cbc21f5c00bf9df38149d7
2021-06-21 19:58:05 +00:00
Junyu Lai
7bef4177b1 Add CTS for registerNetworkOffer am: cdb727ed50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721

Change-Id: I8db28fa843fbb1f3be22f93ff6f9e0faaebf633c
2021-06-21 19:56:52 +00:00
Sudheer Shanka
858dde4109 Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev 2021-06-21 17:50:55 +00:00
Treehugger Robot
af1f7c528d Add CTS for setProfileNetworkPreference am: bd595f739c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618

Change-Id: Ifb59930da0feb99477f5e4b8112248c19aa8f64a
2021-06-21 14:33:14 +00:00
Junyu Lai
cdb727ed50 Add CTS for registerNetworkOffer
Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532

Original-Change: https://android-review.googlesource.com/1731451
Merged-In: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
Change-Id: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
2021-06-21 14:18:34 +00:00
Treehugger Robot
bd595f739c Add CTS for setProfileNetworkPreference
Test: atest android.net.cts.ConnectivityManagerTest
Bug: 190797743
Original-Change: https://android-review.googlesource.com/1733784
Merged-In: Ifffdf55addbb7ec4466d4adec61e5812b7f94320
Change-Id: Ifffdf55addbb7ec4466d4adec61e5812b7f94320
2021-06-21 11:05:54 +00:00
Sudheer Shanka
c017d9adf3 Avoid waiting unnecessarily if there is no data to return.
Bug: 189790442
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I091991aac8eb11319bd60dc8f07124ace1ad52f1
Merged-In: I091991aac8eb11319bd60dc8f07124ace1ad52f1
2021-06-21 05:36:26 +00:00
Lucas Lin
0842b6f551 Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730714

Change-Id: I4b5e26981f464e97613308163ba2647730905f4c
2021-06-18 03:02:28 +00:00
Lucas Lin
7d409ae0c5 Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I3988e8d3df6819e5ef233e8c235488a17131f1b3
2021-06-18 03:02:06 +00:00
Lucas Lin
1b64ae6b87 Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev 2021-06-18 02:47:24 +00:00
Lucas Lin
013cf220f0 Merge "Add a test to check if the VPN type is set or not" into sc-dev 2021-06-18 02:46:50 +00:00
Frank Li
93c4f4cc2d Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I8aa95782a699b6b711441e47adb7056a449986a3
2021-06-18 01:57:57 +00:00