Commit Graph

10733 Commits

Author SHA1 Message Date
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
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
Jean Chalard
21599869f7 Merge "Add more necessary infra to CSTest" into main 2023-09-29 03:50:45 +00:00
Chalard Jean
090b1f586b Move the MULTI_SIM_ACTION receiver inline
This will be easier to read when this behavior is diverted
based on a flag

Test: FrameworksNetTests
Change-Id: Ifd7abd8ad82cb8307b1cd8535ac5fa82004404e6
2023-09-28 21:37:32 +09:00
Chalard Jean
84dfa9f104 Introduce a flag for using the carrier service changed callbacks.
Test: CarrierPrivilegeAuthenticatorTest
Change-Id: Ia28c6abca67866c1de953cb61953a0d2882cd7e2
2023-09-28 21:37:32 +09:00
Treehugger Robot
a2d60c355c Merge "Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"" into main am: dd3e7e0159
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765485

Change-Id: Ic62fe81c96febb8d560d303712dc942ce647362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 23:50:11 +00:00
Patrick Rohr
479dbbd906 Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"
This reverts commit cbe1755826.

Reason for revert: we found the culprit for the flakiness and b/272147742 is fixed.

Change-Id: I672c42bb57184393588666b6196f3a316f8c99c7
2023-09-27 19:20:58 +00:00
Andriy Naborskyy
f891a01eb5 Merge "wear proxy behind portal" into main am: 6aec2583cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762234

Change-Id: Ib5c5489b6abdf3427ccfa2112908b6d42ffd9961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:54:22 +00:00
Patrick Rohr
c571fa59f3 Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main am: 8d44250440
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762228

Change-Id: I11bd2a20dd901b8c1973d8f219d5df63a6973468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:51:10 +00:00
Andriy Naborskyy
6aec2583cd Merge "wear proxy behind portal" into main 2023-09-27 17:39:30 +00:00
Patrick Rohr
8d44250440 Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main 2023-09-27 16:21:12 +00:00
Paul Hu
6df06daaec Store transaction id in MdnsPacket
The transaction id is a number that is used to identify a
specific query packet. But it's not necessary for probing
or announcing services, so the transaction id is not
currently used on advertising when creating a MdnsPacket or
decoding the response to a MdnsPacket. This means that it is not
possible to track which query packets have received
responses. Therefore, store the transaction id so that
it can be used for subsequent query packet changes.

Bug: 302269599
Test: atest FrameworksNetTests
Change-Id: I6734752b32b91678afb7df06e1fa51237cf70894
2023-09-27 18:20:28 +08:00
Andriy Naborskyy
d032dd42ea wear proxy behind portal
Do not avoid captive portal on wear proxy network; keep network agent
after detecting portal.

Bug: 291112432
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I8f6669da62ebd76b6a46d2aec9b3ea563a08cb5e
2023-09-27 07:28:05 +00:00
Yuyang Huang
587fd7b162 Merge "Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest" into main am: b01d0721a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763305

Change-Id: I8954558da7186eaf6e15ce72e7557a4d0a7dc6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 06:08:11 +00:00
Yuyang Huang
b01d0721a2 Merge "Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest" into main 2023-09-27 05:09:55 +00:00
Remi NGUYEN VAN
04085fd688 Merge "Nat464Xlat: rely on netd events being called on handler thread." into main am: d196fab898
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763405

Change-Id: Ice4d84ec6ff98098475e21e8ae96052d1827903a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 03:03:52 +00:00
Chiachang Wang
e72c5a396c Remove Ikev2VpnProfile related shims usage
Ikev2VpnProfile related shims are no longer needed since
downstream branch was moved to udc branch. This commit
also update the methods that are used to do the SDK check
because of the removal of shims.

Test: atest CtsNetTestCases
Change-Id: I4efe65f87ace02b1f1649bf15ccf0ba06fd90486
2023-09-27 02:58:05 +00:00
Remi NGUYEN VAN
d196fab898 Merge "Nat464Xlat: rely on netd events being called on handler thread." into main 2023-09-27 02:01:58 +00:00
Patrick Rohr
f88fccde48 Unregister NetworkCallback in NetworkStatsManagerTest
NetworkStatsManagerTest issues NetworkRequests but does not release
them. In addition, it performs blocking operations inside the
onAvailable() callback that runs on the shared ConnectivityThread
impacting tests that run later.

Test: TH
Bug: 272147742
Change-Id: Ide2f5ba0b12752099d7665deaa9050463cd7ebee
2023-09-26 18:32:55 +00:00
Lorenzo Colitti
3b817cbad3 Nat464Xlat: rely on netd events being called on handler thread.
aosp/2724918 moved processing netd events for 464xlat to the
handler thread.

This CL makes 464xlat run the code that processes those events
inline. This simplifies the code and makes the ordering of events
more similar to what it was before.

Bug: 293965195
Fix: 302071735
Test: existing unit tests
Change-Id: I18b0d491aff94646b878a3d3488b5519fd42783c
2023-09-26 11:00:37 +00:00
Yuyang Huang
9244912a3f Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest
Because the WifiManager can not be obtained in instant mode, the test
should only runs in AppModeFull.

Bug: 300219769
Test: TH
Change-Id: If5049a68dce23aafa3c9b8a59bf9a759c9532541
2023-09-26 18:57:25 +09:00
Treehugger Robot
f4433fb01e Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main am: 8454fb5fed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762789

Change-Id: I48201f22282c5c7951710d97fb977432a0fb5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 09:33:06 +00:00
Treehugger Robot
8454fb5fed Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main 2023-09-26 08:43:15 +00:00
Treehugger Robot
d72e928dea Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main am: 20cb93aa5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756186

Change-Id: I494d15ba85429177f3b96993779db1264aea04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 08:40:46 +00:00
Treehugger Robot
20cb93aa5d Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main 2023-09-26 07:28:01 +00:00
Motomu Utsumi
4d8c70c0eb Cleanup existing firewall rule on myUid before the test
testFirewallCloseSocketAllowlistChainOtherUid sets the firewall rule on
myUid + 1 and confirms this does not affect the network access from
myUid.
This test failed when there is an existing firewall rule on myUid.
This CL cleans up the existing rule on myUid before running the test and
restores the existing state after the test.

Bug: 299898772
Test: atest CtsNetTestCases
Change-Id: I9083ac41a64a8b81a8b4616c0d57a25355f5d53c
2023-09-26 15:52:34 +09:00
Chalard Jean
79adff3ae7 Fix testSetOemNetworkPreferenceForTestPref flake
The issue seems to be that some other network may become
available or change capabilities before Lost happens, as
can be the case with real networks like in CTS.

Test: TH
Bug: 289879931
Change-Id: I849f3b7d99f5d5195a3bbd3c39720923597a51d9
2023-09-26 14:51:05 +09:00
Chalard Jean
073606fc8d Add more necessary infra to CSTest
- Ability to mock enabled changes, which is necessary for
  requestNetwork
- Ability to disconnect an agent

Test: in aosp/2761506
Change-Id: If2701f1fff29453e74a4b388758c6ee3a16a5734
2023-09-25 14:56:09 +09:00
Treehugger Robot
4741c6eba8 Merge "Add test for partial responses" into main am: d292cff70e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2437173

Change-Id: I5f68885adf0083c3cea1de67fd5ce95749246915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 09:36:54 +00:00
Treehugger Robot
d292cff70e Merge "Add test for partial responses" into main 2023-09-20 09:07:15 +00:00
Treehugger Robot
638397b1ee Merge "Add back partial connectivity test to presubmit" into main am: bc884540b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2739413

Change-Id: I790521debb64ce88c1f232b42028ab87735390f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 10:37:29 +00:00
Treehugger Robot
bc884540b3 Merge "Add back partial connectivity test to presubmit" into main 2023-09-19 09:51:17 +00:00
Remi NGUYEN VAN
a52bd9f46d Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib
Although the launcher should be visible due to the <queries> declaration
in the manifest, there are sometimes flakes indicating that the access
to the package was blocked due to visibility rules.

Try adding QUERY_ALL_PACKAGES to see whether it resolves the flakes.

Bug: 286550950
Test: atest
Change-Id: I24dcf19c040b63fea55f82db412ffcd40670e6fc
2023-09-19 15:32:21 +09:00
Remi NGUYEN VAN
0852131520 Add test for partial responses
Test that when a responder only responds with the exact records that
were queried, so only reply for PTR in discovery, only send SRV, TXT,
A, AAAA when asked explicitly, service resolve succeeds.

This ensures that the querier sends followup queries for each record.
See RFC6763 12., especially the last paragraph.

Bug: 267570781
Bug: 267371243
Test: atest NsdManagerTest
Change-Id: Ia392e80c1e27b479c6177d19f6b4be6032dcb1cd
2023-09-14 18:34:58 +09:00
Yuyang Huang
8992911f24 Merge "Add newApi linter check for mDNS library" into main am: 365cf0a393
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2718538

Change-Id: I6e392853943db3ff509bc25a4055367774e65cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 06:17:54 +00:00
Yuyang Huang
365cf0a393 Merge "Add newApi linter check for mDNS library" into main 2023-09-13 05:55:51 +00:00
Paul Hu
6002f71400 Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main am: bda7d35533
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2738817

Change-Id: Iea72367eeabd0ab1e794240eda730a52ef389ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:49:33 +00:00
Paul Hu
bda7d35533 Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main 2023-09-13 02:56:17 +00:00
Treehugger Robot
ac88cd6df9 Merge "Add test for downstream tethering" into main am: dba0dbc7ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606668

Change-Id: I251696b855e7f971ac740eb70fa86a4158f15c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:58 +00:00
Treehugger Robot
dba0dbc7ec Merge "Add test for downstream tethering" into main 2023-09-13 01:01:32 +00:00
Yuyang Huang
fc83170c70 Add newApi linter check for mDNS library
The mDNS library need to be backported to some internal library which
support minSdk 21. Therefore, updated the build rules to add the linter
check.

Bug: 296175311
Test: TH
Change-Id: Iae0bffa315dc6de2339a05f595b13480fa7385ae
2023-09-12 19:01:21 +09:00
Yuyang Huang
fca402abed Add test for downstream tethering
Add end-to-end testing for testing NsdManager advertising and
discovering works fine with downstream tethering interfaces.

Bug: 281639507
Test: atest NsdManagerTest
Change-Id: I5a66423f216cfe0c82db5128502c885980ab264b
2023-09-12 17:53:37 +09:00
Paul Hu
f5ee683cbd Merge "Correct isLegacy metric data" into main am: 046b0c1c82
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745877

Change-Id: Icd79d1af11839f6ddaa914a86843540418b29b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:52:09 +00:00
Mike Yu
384effd6c2 Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main am: 8c02f03949
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745876

Change-Id: I93e98d6ea8cc01265b14ef251af9b9d01a7de75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:50:54 +00:00
Paul Hu
046b0c1c82 Merge "Correct isLegacy metric data" into main 2023-09-12 08:41:10 +00:00
Paul Hu
326c22ff39 Fix flaky test: testOnNetworkConnectivityReportedFalse
The test flake is likely caused by a carrier configuration
update. After the update is complete, the shell permission is
dropped, which causes the test network setup to fail due to a
lack of permission. The test network setup should also be
protected by a synchronized lock to avoid permission lost.

Bug: 296980394
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest \
      --iteration 50
Change-Id: I3c7a0a92cddeb7c0f41a11b929f72714f8b22c05
2023-09-12 16:31:10 +08:00
Mike Yu
8c02f03949 Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main 2023-09-12 07:59:36 +00:00
Paul Hu
508a012b2e Correct isLegacy metric data
The isLegacy field of Nsd metrics should indicate whether the
data was collected from the old backend or not. However, it is
currently only dependent on the ENABLE_PLATFORM_MDNS_BACKEND
compat change value, which is incorrect. This is because the
NsdService always uses the new backend since Android U,
regardless of the compat change value. Therefore, the isLegacy
data should be obtained from each transaction.

Bug: 287546772
Bug: 299880473
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I156abd656b90578d710696a69ccf7dfca97a2c9c
2023-09-12 01:20:00 +00:00