Commit Graph

42147 Commits

Author SHA1 Message Date
Frank Li
23ccaddf1b Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" am: a8a7cfd668 am: c4b4635f20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1743373

Change-Id: Id65f442158f67d149bdc14ef7a00cd56db606c9f
2021-06-23 02:08:53 +00:00
Paul Hu
977a013d10 Merge "Add ConnectivitySettingsManagerTest" am: 6160d60b2e am: f37dd31334
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1738353

Change-Id: I239c14543f6948cb729424008054317b28bb9647
2021-06-23 02:08:49 +00:00
Chiachang Wang
403836f671 Merge "Provide a way to override the avoid bad wifi configuration" am: 38e8c2c94b am: 4ef85d615b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733788

Change-Id: Ibe05bc988f0020eec8485023c3529bcc1696bd80
2021-06-23 02:08:44 +00:00
Frank Li
c4b4635f20 Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" am: a8a7cfd668
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1743373

Change-Id: Id99ab133d4b682cfc77777b63be564c2f5450308
2021-06-23 02:08:39 +00:00
Remi NGUYEN VAN
4b348711de Merge "Add tests for duplicate PendingIntent requests" am: 307cb41ade am: 98138948fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742073

Change-Id: I0246e733e7a33bc4958ebb25948032f3669d1c33
2021-06-23 02:08:35 +00:00
Paul Hu
f37dd31334 Merge "Add ConnectivitySettingsManagerTest" am: 6160d60b2e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1738353

Change-Id: I7c88e70340aa61cf2e54955bbf3ffad7bb7ccd89
2021-06-23 02:08:33 +00:00
Chiachang Wang
4ef85d615b Merge "Provide a way to override the avoid bad wifi configuration" am: 38e8c2c94b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733788

Change-Id: I48af839ba2a8f2e7531aa9a897ad7a1d00f8a676
2021-06-23 02:07:45 +00:00
Frank Li
a8a7cfd668 Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" 2021-06-23 01:58:59 +00:00
Remi NGUYEN VAN
98138948fe Merge "Add tests for duplicate PendingIntent requests" am: 307cb41ade
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742073

Change-Id: I2a628376e38f0ebd363db00710a9499120224416
2021-06-23 01:56:13 +00:00
Paul Hu
6160d60b2e Merge "Add ConnectivitySettingsManagerTest" 2021-06-23 01:36:16 +00:00
Chiachang Wang
38e8c2c94b Merge "Provide a way to override the avoid bad wifi configuration" 2021-06-23 00:48:17 +00:00
Remi NGUYEN VAN
307cb41ade Merge "Add tests for duplicate PendingIntent requests" 2021-06-22 23:35:42 +00:00
Lorenzo Colitti
eb2b4ef80d [automerger skipped] Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0 -s ours
am skip reason: Merged-In I55371fabe0d2fa32a71520af11f18f1eeea31460 with SHA-1 56bc7d4dde is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057280

Change-Id: Ic82ea657b7d22c4452e225b5c292dedf28ef1638
2021-06-22 23:20:50 +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
Junyu Lai
19e40714c9 [automerger skipped] Merge "[SP32] Try to get 1.1 OffloadControl hardware if available" am: 69bc4fede1 am: 1153ba0f83 -s ours
am skip reason: Merged-In I6a3ce877cdff2496087b97b191a9bfd5b0792827 with SHA-1 184d458181 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625680

Change-Id: I33ccea392156c32f3f88f76f519cb409ed1573c6
2021-06-22 21:04:39 +00:00
Junyu Lai
1153ba0f83 Merge "[SP32] Try to get 1.1 OffloadControl hardware if available" am: 69bc4fede1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625680

Change-Id: I4999741010b8a2fbcd449126eb262767ef4f310d
2021-06-22 20:47:19 +00:00
Junyu Lai
69bc4fede1 Merge "[SP32] Try to get 1.1 OffloadControl hardware if available" 2021-06-22 20:31:18 +00:00
Yan Yan
b205411479 Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd am: 0783fed2ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296

Change-Id: I269747f4c2e575d8afb89fcc7685d9fab6d49c31
2021-06-22 17:59:12 +00:00
Yan Yan
0783fed2ba Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296

Change-Id: I41f60bf0bc369b2ea43107355855bfba02ab9e9f
2021-06-22 17:44:29 +00:00
Yan Yan
010ec2cddd Merge "Test updating underlying network of IpSecTunnelInterface" 2021-06-22 17:27:11 +00:00
lifr
279a8ee8f7 Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode
1. testIsPrivateDnsBroken: It requires the
   permission:android.permission.WRITE_SECURE_SETTINGS. But the
   WRITE_SECURE_SETTINGS permission can't be granted to instant
   apps.
2. testSetOemNetworkPreferenceForTestOnlyPref: Instant apps can't
   create test networks.
3. testSetOemNetworkPreferenceForTestPref: Instant apps can't
   create test networks.

Bug: 191678254
Bug: 191680108
Test: atest android.net.cts.ConnectivityManagerTest --instant
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest --instant
Change-Id: Ice43bcf7a1dc34f4a54fefba7f408767f0a4341e
2021-06-23 00:49:25 +08:00
Treehugger Robot
3cadba47c7 [automerger skipped] Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e -s ours
am skip reason: Merged-In I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93 with SHA-1 944d87d179 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276

Change-Id: I8867bd56daf07dff35903a27991840fb974015dd
2021-06-22 11:38:25 +00:00
Remi NGUYEN VAN
e72bac1be4 [automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 -s ours
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374

Change-Id: I3ca7ef1325d4f04a138bf8012de57bbb89825bd4
2021-06-22 10:08:43 +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
Remi NGUYEN VAN
489275e84e Add tests for duplicate PendingIntent requests
Add tests for requestNetwork and registerNetworkCallback with
PendingIntents that are equal as per PendingIntent.intentFilterEquals.

In such situations, the first request is documented to be automatically
unregistered. This means that the PendingIntent should only be fired
once, instead of being fired for both requests.

Currently this behavior is broken for network callbacks (not for network
requests).

Test: atest ConnectivityManagerTest
Bug: 174237997
Change-Id: Ic636c731c71474ef09043d7a26ccfd6e2bb5c39f
2021-06-22 18:24:52 +09: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
33f2121413 [automerger skipped] Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5 -s ours
am skip reason: Merged-In I5505655f52da9fdca2fd43a58e043a9ab727741d with SHA-1 89f2670b65 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057271

Change-Id: I4241e69f0fd88bcab4a3f73c3bdad9dd1a2a090a
2021-06-22 07:57:22 +00:00
Mark Chien
07584931b5 Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev 2021-06-22 07:34:35 +00:00
Chiachang Wang
6eac9fb787 Provide a way to override the avoid bad wifi configuration
ConnectivityManager.setAvoidUnvalidated only works if the
config_networkAvoidBadWifi configuration is set to 0 and the
NETWORK_AVOID_BAD_WIFI setting is unset. There is no easy way
for a testing app to temporary set a test value to verify the
behavior of the API. Thus, add a mechanism to allow test app
to set a period of time to temporary unstrict the resource
configuration, i.e. Temporary simulate config_networkAvoidBadWifi
configured to 0.

Bug: 186061922
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: If772078c61a9b12926f104d5dfc9c9071e844732
2021-06-22 14:54:02 +08:00
Lorenzo Colitti
285821741c [automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c -s ours
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044629

Change-Id: I60100ab98d696b79dae3fd2def6f086138a59f86
2021-06-22 04:49:59 +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
Paul Hu
e203a29272 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8 am: 732ab7557c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

Change-Id: I0176debea776e1ed6473cc52d44160576665db2b
2021-06-22 03:48:10 +00:00
Lucas Lin
3345e0d602 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0 am: d7e6b4dfa9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395

Change-Id: Ib1a9a845b14883e651398deb1a6f35081c551783
2021-06-22 03:47:36 +00:00
Paul Hu
732ab7557c Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

Change-Id: I1db27baa42bcaccbabf9002c950fdcefa6fb2710
2021-06-22 03:26:32 +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
Lucas Lin
d7e6b4dfa9 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395

Change-Id: Id3454c2b2efdf17c3f84fc2e04e14c022baff825
2021-06-22 03:16:30 +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
paulhu
236a992cd0 Add ConnectivitySettingsManagerTest
- Add tests for ConnectivitySettingsManager.
- Also address leftover javadoc comments.

Bug: 182538166
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Change-Id: I8161c1bca84b41964578d59ee5d6ab07b2380707
2021-06-22 03:00:51 +00:00