Commit Graph

42131 Commits

Author SHA1 Message Date
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
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
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
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
Paul Hu
5440e0b8e8 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" 2021-06-22 01:33:49 +00:00
Lucas Lin
da9c2fb600 Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: Idb987331163fde7019febdcbf3e28bf205894d37
2021-06-22 00:02:15 +00:00
Lucas Lin
3f565a44b0 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" 2021-06-21 23:58:49 +00:00
Lucas Lin
9ca145bcfa Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: I91b2ece57f79308436cf34ab3fbf9cdbd6961ed7
2021-06-21 23:50:27 +00:00
Lucas Lin
f602b03178 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835 am: 72d2223bf7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6cc3cc6f52ffb783bb21e3914b4eacd19756d755
2021-06-21 23:37:47 +00:00
Lucas Lin
56055496f3 Merge "Use assertEquals instead of assertTrue to compare the vpn type" 2021-06-21 23:35:16 +00:00
Lucas Lin
72d2223bf7 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6a26a8b344c367ce1b876ce67a443435f3de776a
2021-06-21 23:22:19 +00: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
Lucas Lin
7e2a491835 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" 2021-06-21 20:52:46 +00:00
Lucas Lin
833cb00abf Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4 am: 8f8e1512d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: Ifbe743b2f1eccfb1e553e6521cc0a461a8a475d8
2021-06-21 20:51:42 +00: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
James Mattis
ed5d25d599 Merge "Updating timeout for Per-App CTS" am: 420072651d am: eaa493d033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: Ia7035d953fe0f073467b608b58aa06f65a313224
2021-06-21 20:50:56 +00:00
Lucas Lin
8f8e1512d6 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: I1b0b4beb6653cfc5d09da3d5eda18a6b0a980982
2021-06-21 20:22:10 +00:00
James Mattis
eaa493d033 Merge "Updating timeout for Per-App CTS" am: 420072651d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: I53a0510dd4008be8cb68daf6c65f816b8d0f68a2
2021-06-21 20:21:55 +00:00
Sudheer Shanka
67a0ad8ce6 [automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 -s ours
am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 f3d8c6f70e is already in history

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

Change-Id: I44d25f1cb3e93bcdbedf424927d42f2c4d1e16b1
2021-06-21 19:58:15 +00:00
Junyu Lai
35aeed5e5a [automerger skipped] Add CTS for registerNetworkOffer am: cdb727ed50 -s ours
am skip reason: Merged-In Ic3ab3c487d8a9b5a9508b59f83ae35672307b933 with SHA-1 f20360649f is already in history

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

Change-Id: I328eecc56b928b84d259e66ca380163ad6b17214
2021-06-21 19:54:15 +00:00