Commit Graph

10985 Commits

Author SHA1 Message Date
Paul Hu
a8f2408e3a Merge "Store transaction id in MdnsPacket" into main am: 87d128f43d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2766487

Change-Id: Ibe9203942ecfae83caeacdaa9287a2a79ce6a80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 06:11:35 +00:00
Paul Hu
87d128f43d Merge "Store transaction id in MdnsPacket" into main 2023-10-06 05:51:33 +00:00
Treehugger Robot
b3493eea05 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main am: 6a5ab05e87
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774205

Change-Id: I476aa7fc7f839285e7a86596b06a0e4a7dbee316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 07:18:41 +00:00
Treehugger Robot
d17a2a7073 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main am: 6a5ab05e87
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774205

Change-Id: Ibb32d8ee8f8a87c7e81ddee6012d8bd95b7e095e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 07:16:14 +00:00
Treehugger Robot
6a5ab05e87 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main 2023-10-05 06:44:32 +00:00
Paul Hu
f286ed5be1 Include A/AAAA records in probing packet
Per RFC6762#8.1, a host can simultaneously probe for uniqueness
of its "A" record and all its SRV records [RFC6763] in the same
query message. Add a flag to include the A/AAAA records in the
probing packet if necessary.

Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I365a938a6c481df755a0598b175069b94905fa3b
2023-10-05 14:14:56 +08:00
Motomu Utsumi
aa2f4d839e Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest
Bug: 303299687
Test: atest
Change-Id: Iad740804a59599dd33add1ea85aa4771e0e4bd35
2023-10-05 12:23:20 +09:00
Jean Chalard
ddd00cd23a Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460

Change-Id: I017eafbc7dcf191cf6babcd3c43fa89a66546bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:07:15 +00:00
Jean Chalard
65df0450d3 Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460

Change-Id: Iae3a8f278aca4627b6fa58e85beee6ef5aeeedbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:05:12 +00:00
Jean Chalard
e7b7ceb70d Merge "Remove an NPE in tearDown" into main 2023-10-05 02:44:59 +00:00
Maciej Żenczykowski
38cd577ed9 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768572

Change-Id: I84417bfd7fcc5f86b86edf2c2640d60a2af45126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 13:47:50 +00:00
Maciej Żenczykowski
bdb923eb96 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768572

Change-Id: Ib4b6b69bed939ff6472efd4f60dc5950f3a0d2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 13:45:53 +00:00
Maciej Żenczykowski
99c8a5d1e2 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main 2023-10-04 13:10:54 +00:00
Junyu Lai
9272120c48 Adds more data points for benchmarking tests
To have better observation of overall improvement, more real
data points from the fields are needed.
This change adds more anonymous data points which are collected
from users who agreed to share the dataset for testing purpose.

Test: atest ConnectivityBenchmarkTests
Bug: 269409485
Change-Id: If7cb1cbb8215e4a4abcbf90c1fdcc141e19ecc44
2023-10-04 17:37:46 +08:00
Junyu Lai
56b03edede Move test zip file to assets
This is a no-op refactoring which move test data from resources
to assets, and repacking zip file to contain netstats sub-folder.

This is needed for later patches to put more test data points,
and having easier way to access them in batch.

Test: atest ConnectivityBenchmarkTests
Bug: 269409485
Change-Id: I1d09ac0187c9ce12982161243929d8e10483da45
2023-10-04 17:24:37 +08:00
Hansen Kurli
78b06ebe84 Make variables in testLegacyLockdownVpn() final.
Test: atest FrameworksNetTests
Change-Id: Ie852286275f0e377be582648f7766c077d9877e8
2023-10-04 16:50:05 +08:00
Hansen Kurli
b2764be9b6 Update testLegacyLockdownVpn to mock VPN.
Override more VPN methods to mock the VPN interaction of
testLegacyLockdownVpn instead of relying on the Vpn class.
This includes:
    1. Overriding startLegacyVpnPrivileged() and avoid creating
       a VpnRunner.
    2. Removing expectStartLegacyVpnRunner() since it is not
       used when startLegacyVpnPrivileged() is overridden.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Id55d8d6cd03b84bca815cd331eb0f7d584eaed5f
2023-10-04 16:47:10 +08:00
Hansen Kurli
acb5205558 Remove the fail case on IPv6 in testLockdownVpn
In testLegacyLockdownVpn, remove the fail check on IPv6 networks
and add coverage in VpnTest instead as this interaction relies
on the Vpn implementation, not ConnectivityService.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Ib24809ece2332c4c3d3e08c168e02ad859242eac
2023-10-04 16:45:45 +08:00
Hansen Kurli
35f6fef389 Remove LockdownVpnTracker from testLegacyLockdownVpn
The test coverage of LockdownVpnTracker has been moved to a
separate unit test file. testLegacyLockdownVpn now calls the Vpn
methods directly instead of creating a new LockdownVpnTracker.
Note this removes calls to expectStopVpnRunnerPrivileged since
stopVpnRunnerPrivileged is now directly called in the test so it
is already guaranteed to be called.

The expected calls/behavior of LockdownVpnTracker can be seen in
LockdownVpnTrackerTest.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Id9d26435bf62ffef954f6c7fa0558ce99540de1f
2023-10-04 16:44:09 +08:00
Motomu Utsumi
bbf74da2b5 Merge "Cleanup existing firewall rule on myUid before the test" into main am: 18520551db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762791

Change-Id: I02664c27248091212dbfc094b2a8364fbfc2e7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 02:44:40 +00:00
Motomu Utsumi
26229fd5b2 Merge "Cleanup existing firewall rule on myUid before the test" into main am: 18520551db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762791

Change-Id: Ia13201039eba40885ec2e6298e85265116280fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 02:42:39 +00:00
Motomu Utsumi
18520551db Merge "Cleanup existing firewall rule on myUid before the test" into main 2023-10-04 02:15:06 +00:00
Maciej Żenczykowski
ee20a09bdb cts: fix android.net.cts.VpnServiceTest#testProtect_int flake
This is written based on observation that
  testStartVpnProfileNoPreviousConsent()
appears to result in the right things happening when running
  adb logcat | egrep --color -i 'Switched from |protect'
ie. it results in:
  I netd    : networkSetProtectDeny(<ctsappuid>) <0.01ms>
  I Vpn     : Switched from android.net.cts to [Legacy VPN]
  I netd    : networkSetProtectAllow(1000) <0.00ms>

Which disallows the CTS uid, and allows AID_SYSTEM.

That in turn appears to be the 'default' state of things.

So this basically copies that logic into tearDown()

Test: atest android.net.cts.{Ikev2VpnTest,VpnServiceTest} --iterations 2
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic9cca56097d78ae48157e808081de2ebb76635e8
2023-10-03 23:59:20 +00:00
Treehugger Robot
1032b1c039 Merge "Disable the remaining VPN CTS tests on watches." into main am: c8a42f6a39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624254

Change-Id: I5999183d5d641ada0e1b477c2edcb73ee2c45d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 17:46:04 +00:00
Treehugger Robot
2b9afa997f Merge "Disable the remaining VPN CTS tests on watches." into main am: c8a42f6a39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624254

Change-Id: I6afcbc529e973ba37b5b421d027c601a1094cbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 17:42:36 +00:00
Treehugger Robot
c8a42f6a39 Merge "Disable the remaining VPN CTS tests on watches." into main 2023-10-03 16:39:31 +00:00
Jean Chalard
98f2f90a82 Merge "Prioritize non-slices over slices" into main am: d393732dba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760328

Change-Id: Iba848062cefe19639fd104f03cd03d0dfddb634a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 13:13:33 +00:00
Jean Chalard
5a7025b1c4 Merge "Prioritize non-slices over slices" into main am: d393732dba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760328

Change-Id: I0370165b259331baec9c08a6600536d95bbf36b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 13:11:13 +00:00
Jean Chalard
d393732dba Merge "Prioritize non-slices over slices" into main 2023-10-03 12:39:11 +00:00
Chalard Jean
14499f0119 Prioritize non-slices over slices
For general internet access, a specialized slice is generally
not preferable to a non-specialized network.

Test: new test in this patch
Change-Id: I052ce923300566807999b2f20f5911181fb761dd
2023-10-03 21:30:49 +09:00
Chiachang Wang
1f47e6f2e6 Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764585

Change-Id: I16a43aff0260fc52488cf18a75732def3cbb9e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 08:16:09 +00:00
Chiachang Wang
5755c8e90a Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764585

Change-Id: I22da9082a21397cc790d79eb7e4c99b12c2eb8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 08:14:09 +00:00
Chiachang Wang
0509e0da16 Merge "Remove Ikev2VpnProfile related shims usage" into main 2023-10-03 07:45:41 +00:00
Chalard Jean
ec0149f1ba Remove an NPE in tearDown
This is masking an exception in setUp() and makes debugging difficult

Test: treehugger
Change-Id: I8b5b80c4171d45076dd02bab5ff4b6dc81d98086
2023-10-03 16:01:00 +09:00
abdelrahmani
5bcbbc1ce9 Disable the remaining VPN CTS tests on watches.
- Watches don't support VPN apps.
- The HostsideVpnTests CTS tests are already skipped on watches.
- The tests for VpnManager VPNs do run on watches, but there isn't
  actually a way to start a VpnManager VPN on a watch because there is
  no way to display the consent dialog to the user.
- The VpnService CTS tests verify the VpnService API on watches
  bypassing the consent dialogs.
- Because there is no way to start a VPN app on a watch, there's no
  point requiring the VPN CTS tests to pass.

This CL disables the remaining VPN CTS tests on watches. This allows
watches to disable the VPN service, reducing startup time and memory
usage.

Bug: 286240194
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: Idb7110232ae7e45cafc265cd4f955c2a6b22361c
2023-10-02 06:29:46 +00:00
Maciej Żenczykowski
1c731124bb Lower CLAT max MTU from 65536 to 1528. am: 9f94648b7f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2677095

Change-Id: Ib25f4a51d04840bd518274570dd14d71b1a7343d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 19:58:56 +00:00
Maciej Żenczykowski
5d4d419b97 Lower CLAT max MTU from 65536 to 1528. am: 9f94648b7f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2677095

Change-Id: Ifb1bc76f95e8eef24ed12a65fdf0a8cd4b4d360c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 19:58:41 +00:00
Maciej Żenczykowski
9f94648b7f Lower CLAT max MTU from 65536 to 1528.
Android's clat is for reaching the internet, which in general
never has an ipv4 L3 mtu higher than 1500.

(We could probably hit this on a jumboframe enabled IPv6-only
wifi network [ http://b/292057969#comment18 ] where RA claims
MTU of 9K [9170])

Bug: 292057969
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7a32455571458b8a3f1121ad980d54323b2ef06b
2023-09-30 14:23:51 +00:00
Jean Chalard
ed7f5fd541 Merge changes I52fcfd3f,I6de4abdc,I1e8944de,I9525bfe0,Ife09fef8, ... into main am: 868859d4ef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2411144

Change-Id: I1b1a244bf924504a2a575d757d41049a85ff975c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 05:10:35 +00:00
Jean Chalard
af5fb4dfdc Merge changes I52fcfd3f,I6de4abdc,I1e8944de,I9525bfe0,Ife09fef8, ... into main am: 868859d4ef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2411144

Change-Id: I3be1739824cd0051db27a1c134de7f209bbf992b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 05:10:20 +00:00
Treehugger Robot
abb315b55d Merge "Remove debug only restrictions to network tracing" into main am: 06c8691fe0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768925

Change-Id: I4d61b9d51da684e1ee7f44449a4f3876475766bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 05:10:18 +00:00
Treehugger Robot
abb723ab5e Merge "Remove debug only restrictions to network tracing" into main am: 06c8691fe0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768925

Change-Id: I3a5de68794272cd076d8ab7f90b7c8659c2d2ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 05:10:03 +00:00
Jean Chalard
868859d4ef Merge changes I52fcfd3f,I6de4abdc,I1e8944de,I9525bfe0,Ife09fef8, ... into main
* changes:
  Use carrier service changed callbacks when flag is on
  Delete slots as the listeners are unregistered.
  Have a full class (not inline) for privilege listener
  Update the carrier service UID when onCarrierServiceChanged
  Pass the modem count to registerCarrierPrivilegeListeners
  Reorder add/remove/register/unregister carrier listeners
2023-09-30 04:40:31 +00:00
Ryan Zuklie
9fb8f18c1b Remove debug only restrictions to network tracing
Network tracing was only available on userdebug and eng builds. This
change makes it available on all build types behind a flag.

Bug: 298197881
Test: flash & trace, toggle flag on/off
Change-Id: I75d854aee74adf7e23f7a970b20233790f9b0354
2023-09-29 16:52:11 -07:00
Jean Chalard
9759164e5a Merge changes Ifd7abd8a,I39cab8ff,I6b3270d6,Ia28c6abc,If47d7e23 into main am: 1d600f4300
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405726

Change-Id: I809946be3951d040fbe01d56b8942f2333e28239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:07:35 +00:00
Jean Chalard
6d5e0ad07e Merge changes Ifd7abd8a,I39cab8ff,I6b3270d6,Ia28c6abc,If47d7e23 into main am: 1d600f4300
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405726

Change-Id: I9867b0c48537dd0164a3858328c865c667847289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:07:23 +00:00
Chalard Jean
361dad3243 Use carrier service changed callbacks when flag is on
Test: FrameworksNetTests
      Note that carrierPrivilegeAuthenticatorTest is already
      an @Parameterized test with flag = on and off, so it
      already tests both.
Change-Id: I52fcfd3f21a13d7a39952ba828464ce6ef4085c2
2023-09-29 15:48:48 +09:00
Jean Chalard
1d600f4300 Merge changes Ifd7abd8a,I39cab8ff,I6b3270d6,Ia28c6abc,If47d7e23 into main
* changes:
  Move the MULTI_SIM_ACTION receiver inline
  Inline registerForCarrierChanges
  Make mThread a local
  Introduce a flag for using the carrier service changed callbacks.
  Have DevSdkIgnoreRunner support @Parameterized parameters
2023-09-29 06:46:08 +00:00
Jean Chalard
18fb6da197 Merge "Add more necessary infra to CSTest" into main am: 21599869f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761505

Change-Id: Ia03c6de4724b36905f49dc4821695d475b0ea1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 03:59:30 +00:00
Jean Chalard
4a6cedb536 Merge "Add more necessary infra to CSTest" into main am: 21599869f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761505

Change-Id: I27cacafc113f5acc6d9f105fdfc8991a597acf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 03:59:18 +00:00