Commit Graph

29053 Commits

Author SHA1 Message Date
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
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
Frank Li
ab46d66d0d Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234

Change-Id: Ia41376d391cdfa3444b4a46ae003d315bbfc45f9
2021-06-18 01:57:43 +00:00
Frank Li
ee4006fa06 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: I39ebd7e74d548971af7e6581ce77f32b9be82208
2021-06-18 01:57:18 +00:00
Frank Li
799d1c6053 Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev 2021-06-18 01:37:20 +00:00
Frank Li
9097aaf5db Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev 2021-06-18 01:37:08 +00:00
Frank Li
a9602dc5d3 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev 2021-06-18 01:36:44 +00:00
James Mattis
a4e465da0b Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I0f8b1a947ca6e738bc21ee2c49e2412b2f99997d
2021-06-17 16:28:42 +00:00
James Mattis
24ab50b086 Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev 2021-06-17 16:08:58 +00:00
Frank Li
f8e2e20f32 Add CTS test for NetworkRequest.getCapabilities API
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
      atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Original-Change: https://android-review.googlesource.com/1717737
Merged-In: I8504caa586bdb567d42047a96029dedc67968793
Change-Id: I8504caa586bdb567d42047a96029dedc67968793
2021-06-17 13:42:34 +00:00
Frank Li
3a48843e49 Add test for ConnectivityService API isPrivateDnsBroken
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1719395
Merged-In: Ib45aa439683d48360652a91d7a0609dc82adda33
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33
2021-06-17 13:22:39 +00:00
Frank Li
b7eebde98a Add CTS test for API setLegacyExtraInfo
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
      atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Original-Change: https://android-review.googlesource.com/1719131
Merged-In: Ief14f6de0cb6913da944414f0b134eb04346425f
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
2021-06-17 13:00:57 +00:00
Lucas Lin
b63f479a02 Add a test to check if the VPN type is set or not
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1733785
Merged-In: I7ed5989ec767494c1033dc01242b32724e120c4e
Change-Id: I7ed5989ec767494c1033dc01242b32724e120c4e
2021-06-17 11:15:17 +00:00
Lucas Lin
950a65f8cc Send a proxy broadcast when apps moved from/to a VPN
When the apps moved from/to a VPN, a proxy broadcast is needed to
inform the apps that the proxy might be changed since the default
network satisfied by the apps might also changed.
Since the framework does not track the defautlt network of every
apps, thus, this is done when:
  1. VPN connects/disconnects.
  2. List of uids that apply to the VPN has changed.
While 1 is already covered by the current design, the CL implements
2 in order to fulfill the case that different networks have
different proxies.

Bug: 178727215
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1717735
Merged-In: Ifa103dd66394026d752b407a1bee740c9fcdad2b
Change-Id: Ifa103dd66394026d752b407a1bee740c9fcdad2b
2021-06-17 11:10:46 +00:00
Junyu Lai
00b03beb31 Fix expectCallback does not fail when no callback received am: 52e3fa127a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: Icd7743a03627382bf797b859b48b02bbee635b1f
2021-06-17 10:40:09 +00:00
Junyu Lai
d576a4d0a9 Add CTS for registerBestMatchingNetworkCallback am: 512efafd32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: I975a03a391d09787975a9572aa097b47709f817e
2021-06-17 10:40:07 +00:00
Junyu Lai
1fefd7f674 No-op refactoring of NetworkAgentTest am: e5bdc06735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: Id039d9285e4c7aefd59a75be68ff5a2f039e260c
2021-06-17 10:40:05 +00:00
lifr
396c9afb65 Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I15d0567cae9f26c276377a60c73732d91264f818
2021-06-17 10:39:43 +00:00
Junyu Lai
52e3fa127a Fix expectCallback does not fail when no callback received
This hides 3 bugs where,
  1. In Android S, onNetworkRequested is no longer broadcasted
     by ConnectivityService in any condition. However, the test
     still passes since assertion does not fail when no callback
     received. Ignore the test on S+ devices since the behavior
     changed on S or later devices.
  2. Test network agent is not registered, but the test still
     passes.
  3. Test network agent does not fulfill the request that kept
     the network up, so the test fails since the test network
     is not needed and be torn down.

Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Merged-In: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
Change-Id: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
  (cherry-picked from aosp/1731450)
2021-06-17 09:03:11 +00:00
Junyu Lai
512efafd32 Add CTS for registerBestMatchingNetworkCallback
Bug: 188657173
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest \
      CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Merged-In: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
Change-Id: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
  (cherry-picked from aosp/1727824)
2021-06-17 09:02:17 +00:00
Junyu Lai
e5bdc06735 No-op refactoring of NetworkAgentTest
This is a no-op refactoring of NetworkAgentTest, which makes
the create*NetworkAgent helper functions easier to use, this
includes:
  1. Rename "name" field to specifier, since it is the only
     purpose of that field.
  2. Make the callback generated with agent dedicated to the
     agent by adding specifier to support multiple agent cases.
  3. Refactor some code flow to for readability and less
     duplicated code.

Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      --rerun-until-failure 100
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188657173
Merged-In: Id7948d218b78ae0abf253ca8925e787362ac463f
Change-Id: Id7948d218b78ae0abf253ca8925e787362ac463f
  (cherry-picked from aosp/1727823)
2021-06-17 09:01:09 +00:00
lifr
42096be0c6 Add CTS test for NetworkAgent/NetworkAgentConfig API
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Merged-In: Ia67b963b8e18af8440b1b9bd91f53439848bb838
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
  (cherry-picked from aosp/1693668)
2021-06-17 09:00:30 +00:00
Lorenzo Colitti
6009cf9746 Correctly dump IPv4 downstream flows. am: 175fefc795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965965

Change-Id: Id7033bb1863e7f4930c3e3da63641fadfb0c3ef2
2021-06-16 14:43:06 +00:00
Lorenzo Colitti
175fefc795 Correctly dump IPv4 downstream flows.
The current code does not print these correctly: it prints the
public address twice and then the NAT address. Fix this to print
the src, nat, and dst addresses.

Also dump the output MAC address.

Example output:

    IPv4 Upstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
      [66:f1:6f:d8:66:0a] 31(31) 192.168.146.173:48594 -> 11(rmnet_data1) 100.100.109.185:48594 -> 8.8.8.8:853 [00:00:00:00:00:00] 32305ms
      [66:f1:6f:d8:66:0a] 31(31) 192.168.146.173:45806 -> 11(rmnet_data1) 100.100.109.185:45806 -> 8.8.4.4:853 [00:00:00:00:00:00] 32305ms
    IPv4 Downstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
      [00:00:00:00:00:00] 11(rmnet_data1) 8.8.8.8:853 -> 31(31) 100.100.109.185:48594 -> 192.168.146.173:48594 [0e:a8:7f:ba:76:48] 32305ms
      [00:00:00:00:00:00] 11(rmnet_data1) 8.8.4.4:853 -> 31(31) 100.100.109.185:45806 -> 192.168.146.173:45806 [0e:a8:7f:ba:76:48] 32305ms

Test: manual
Bug: 190783768
Original-Change: https://android-review.googlesource.com/1737399
Merged-In: I93a82064c95027c7c63cb30baf8482ecddcbd09d
Change-Id: I93a82064c95027c7c63cb30baf8482ecddcbd09d
2021-06-16 13:25:33 +00:00
TreeHugger Robot
65e4008df2 Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965964

Change-Id: Ic8dd87cdd344d5ac88d195faf1d510679f5c30c7
2021-06-16 13:08:50 +00:00
TreeHugger Robot
75eb9e6ba9 Merge "Ignore testFactoryReset in instant app mode" into sc-dev 2021-06-16 12:56:27 +00:00
Lorenzo Colitti
e276a5c2e0 Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991452

Change-Id: I342d1bbdd1f2a654a98d454f71a5e5e9654dba95
2021-06-16 12:00:03 +00:00
Lorenzo Colitti
7a1c1fee31 Verify kernel implementation of AES-CMAC am: c1a70345b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991451

Change-Id: If2f59885fb8f8189138fa61e6d640bd19c8cb615
2021-06-16 11:59:54 +00:00
Lorenzo Colitti
816ff6966b Verify kernel implementation of AES-XCBC am: 69b777ccc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991432

Change-Id: I9d82303cd0b558e0c41f5f2fc1222ffa707ea6e9
2021-06-16 11:59:42 +00:00
Lorenzo Colitti
41d5080646 Verify kernel implementation of AES-CTR am: 816c800df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988702

Change-Id: I216c6ebe834839f8be089cf469a19045293452c2
2021-06-16 10:45:45 +00:00
Lorenzo Colitti
4d97e41293 Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988701

Change-Id: I096ae20fda86a2cc593b516079fd072183ba672e
2021-06-16 10:45:43 +00:00
Lorenzo Colitti
5935f1ea81 Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14990605

Change-Id: I40c2a64de05388918d35748ad99591f73000ca79
2021-06-16 10:45:41 +00:00