Commit Graph

84942 Commits

Author SHA1 Message Date
Paul Hu
37c6b51e4e Add a handler thread check to all public methods am: d5b24b4855
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593665

Change-Id: I4c5da9d97fc55954c65f06bb59c5d659c7a62a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 11:15:01 +00:00
Paul Hu
bd5359529d Use SocketKey in MdnsServiceCache am: 775840e1b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648319

Change-Id: Ie72151c0d878eab35c76b4d52b32f2c0653971a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 10:12:12 +00:00
Paul Hu
d5b24b4855 Add a handler thread check to all public methods
To ensure that all access to the MdnsServiceTypeClient is done on
the handler thread, a handler thread check must be added to all
public methods in the MdnsServiceTypeClient. This will allow the
synchronized lock to be removed in future changes, and it will
also ensure that MdnsServiceTypeClient can access MdsServiceCache
properly.

Bug: 265787401
Test: atest FrameworksNetTests
Change-Id: I0206874eb0acdf0272b8ad23d29f3e764bfdec38
2023-07-05 07:46:36 +00:00
Treehugger Robot
682ff9559b Merge "Adjust query frequency based on remaining TTL" am: e59d30bc2a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632294

Change-Id: I1f245f7d21172d7492c2d942ff30b0c809cda3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 07:02:55 +00:00
Paul Hu
775840e1b4 Use SocketKey in MdnsServiceCache
The MdnsServiceTypeClient is now created using a SocketKey, so
the MdnsServiceCache should also use the SocketKey to deal with
the caching services.

Bug: 265787401
Test: atest FrameworksNetTests
Change-Id: I6165ffd420a39e750c06778b4851142a3ba3cf44
2023-07-05 06:38:41 +00:00
Treehugger Robot
e59d30bc2a Merge "Adjust query frequency based on remaining TTL" 2023-07-05 06:19:38 +00:00
Treehugger Robot
e9b887d465 Merge "Migrate HostsideNetworkTestCase to use JUnit4" am: 1a59004c12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2643291

Change-Id: If34fcd3dcb48068fa6aa9243afd1d2ea6cc45d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 04:35:37 +00:00
Treehugger Robot
1a59004c12 Merge "Migrate HostsideNetworkTestCase to use JUnit4" 2023-07-05 04:08:33 +00:00
Yuyang Huang
f56c92f3ff Adjust query frequency based on remaining TTL
After numOfQueriesBeforeBackoff query, the mDNS discovery logic will
enter backoff mode. In backoff mode,  the query frequency will be
updated to max(20, 0.8 * shortest remaining TTL) seconds. It will help
to reduce mDNS query frequency in certain use cases.

Bug: 284480315
Test: atest CtsNetTest FrameworksNetTests
Change-Id: Iac8baaaf58cf9b3b8e67e1cd80402fdecde1d3d4
2023-07-05 13:01:19 +09:00
Junyu Lai
dc075e33c6 Migrate HostsideNetworkTestCase to use JUnit4
This is no-op refactoring but allows subsequent
changes to use modern JUnit4 functionalities such
as @BeforeClass annotation.

Test: atest HostsideNetworkCallbackTests \
      HostsideConnOnActivityStartTest \
      HostsideSelfDeclaredNetworkCapabilitiesCheckTest \
      HostsideVpnTests HostsideNetworkPolicyManagerTests
Bug: 289002798
Change-Id: I503c13ffcb239c4535781ba5d660a3280b7a395b
2023-07-05 10:28:58 +08:00
Chiachang Wang
7eced64918 Merge "Add some timeout for waiting proxy being updated" am: 8c0cefc928
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628997

Change-Id: Id362e59e8ca45507bb1a99b5ba36d7aaa7fe6a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 12:08:32 +00:00
Chiachang Wang
8c0cefc928 Merge "Add some timeout for waiting proxy being updated" 2023-07-04 11:40:13 +00:00
chiachangwang
3a323cf7cc Add some timeout for waiting proxy being updated
[MUST_SLEEP]ActivityThread may not have time to set the updated
proxy into properties yet and cause flaky. Wait for some time in
the test to deflake the test.

Bug: 286551100
Test: com.android.cts.net.HostsideVpnTests
Change-Id: I74d3d7378adcf12c094cb9c0706579d6e0b0826b
2023-07-04 09:37:57 +00:00
Mark Chien
1f86f34466 Merge "Don't run EthernetTetheringTest if Ethernet is not supported" am: df41b36fc9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646401

Change-Id: I3ce36cee0cd7ff869c865966238dd588dfbd51cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:21:38 +00:00
Chiachang Wang
ad099b29c3 Merge changes from topics "recoveryTimeUnit", "vpnRecovery" am: 537451ea67
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648501

Change-Id: Id55a01d8a3cdea2dfb070eddab7cebfabd85b87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:21:25 +00:00
Mark Chien
df41b36fc9 Merge "Don't run EthernetTetheringTest if Ethernet is not supported" 2023-07-04 09:12:34 +00:00
Chiachang Wang
537451ea67 Merge changes from topics "recoveryTimeUnit", "vpnRecovery"
* changes:
  Update tests to reflect the time unit change in Vpn
  Update tests for VPN data stall recovery
2023-07-04 08:50:45 +00:00
chiachangwang
d34aac4123 Update tests to reflect the time unit change in Vpn
Test: atest FrameworksNetTests
Change-Id: I84a3f75bb527136bd0319f5af1bc43d2575495dd
2023-07-04 08:27:44 +00:00
Treehugger Robot
1b614cb2b5 Merge "Degrade a system crash to a Log.wtf" am: 807608edb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648503

Change-Id: I52895b2f845100ef2a184a0a032aaec405b19e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 06:53:39 +00:00
Treehugger Robot
807608edb6 Merge "Degrade a system crash to a Log.wtf" 2023-07-04 06:19:24 +00:00
chiachangwang
42ba18ca1e Update tests for VPN data stall recovery
Data stall recovery in VPN does not rely on the data stall
event now. Update the tests accordingly.

Bug: 289746779
Test: atest FrameworksNetTests
Change-Id: I4d2d96fe2f76706512325b6653b3e7cced10f207
2023-07-04 05:49:49 +00:00
Hansen Kurli
cceba5dcc0 Merge "Skip writing the metrics before T." am: 640c806e23
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646562

Change-Id: Idbf393427a5a44263aca7e68a95459b4fdbb3cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 05:08:35 +00:00
Hansen Kurli
640c806e23 Merge "Skip writing the metrics before T." 2023-07-04 04:35:26 +00:00
Chalard Jean
5251e078a3 Degrade a system crash to a Log.wtf
We've never observed this crash but we're also not very
confident it never happens. wtf is a lot safer and will
report to us if it ever happens.

Test: manual
Change-Id: I56edb069f0ef9bd0f6e5c9a737fdfd708ec7bc57
2023-07-04 13:12:00 +09:00
Paul Hu
8f84940454 Merge "Rename some variables in NsdService" am: 2388643f92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2627851

Change-Id: I5edc2dbb68e198fe2ff6e8c2413a8a04d451bc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 02:00:01 +00:00
Paul Hu
2388643f92 Merge "Rename some variables in NsdService" 2023-07-04 01:23:41 +00:00
Hansen Kurli
ab85de69b1 Skip writing the metrics before T.
Repeated fields are only supported on T+ and the metrics in
KeepaliveStatsTracker contains repeated fields. Hence, guard the write
with a T+ check.

Bug: 289344384
Test: Manual test
Change-Id: If3be75292b5a79aa753bddb772fe2c52c9dde994
2023-07-03 10:43:28 +00:00
Chiachang Wang
13773d1e79 Merge "Translate v4 keepalive packet on clat started network to v6" am: 7e1076e174
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2615629

Change-Id: I1b973b5fe6fef03583b1cf4fec3f50e1b8588007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03 09:54:01 +00:00
Mark
dc581e6c8f Don't run EthernetTetheringTest if Ethernet is not supported
Bug: 288844185
Test: atest CtsTetheringTest
Change-Id: Ie918a0657ab17900437918f7ae99f7aa2539052c
2023-07-03 09:25:18 +00:00
Chiachang Wang
7e1076e174 Merge "Translate v4 keepalive packet on clat started network to v6" 2023-07-03 09:14:09 +00:00
Chiachang Wang
769d7c1405 Merge "Add methods to provide clat v4 source address" am: be2f4047fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2643474

Change-Id: I73e73febf8fefa1b99ec37aa83bc773aede3988d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03 08:08:23 +00:00
Chiachang Wang
be2f4047fe Merge "Add methods to provide clat v4 source address" 2023-07-03 07:42:10 +00:00
Paul Hu
fc4bdca6d5 Merge "Move NsdServiceInfoTest to common tests" am: f51a0139a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2411134

Change-Id: Ia3706bc879d793f920897542bd074e39741758d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03 07:05:55 +00:00
Paul Hu
f51a0139a2 Merge "Move NsdServiceInfoTest to common tests" 2023-07-03 06:24:43 +00:00
Treehugger Robot
209dbf4585 Merge "RateLimitTest: temporarily dump ConnectivityThread if setUp fails" am: d5a2851ab6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646300

Change-Id: I0701751b1a4b4b9f4c9b2f03b6bb824eac1e8dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:12:57 +00:00
Treehugger Robot
d5a2851ab6 Merge "RateLimitTest: temporarily dump ConnectivityThread if setUp fails" 2023-07-01 00:36:15 +00:00
Patrick Rohr
cbe1755826 RateLimitTest: temporarily dump ConnectivityThread if setUp fails
This will hopefully help provide more information for debugging b/272147742.

Bug: 272147742
Test: atest RateLimitTest
Change-Id: I58ca7ee62d34302eb96056fced5bbc2f9a3e2e72
2023-06-30 15:59:12 -07:00
Chalard Jean
877dab017c [automerger skipped] Evaluation delay = 8 secs for explicitly selected networks am: 4134c26ebf -s ours
am skip reason: Merged-In I99a263960cbc9292868fc4bb46a4f3b2f3c71541 with SHA-1 0f1413395d is already in history

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

Change-Id: I9a5705ea527c672501c9c7a5b2ff079c83797e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:27:16 +00:00
Chalard Jean
adb460a5c6 [automerger skipped] Allow firing the LOST_INTERNET intent immediately in config am: 3bf3a59f35 -s ours
am skip reason: Merged-In I88565839a12a1ab4b096f763250944ebaf6c5349 with SHA-1 e13b833b21 is already in history

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

Change-Id: I62481dfd8d345a58b0e8e909269816ffb990f7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:27:13 +00:00
Jean Chalard
6616e8d099 Merge changes Iab0ffbb5,I2cbe9906 am: 583d0d437a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646561

Change-Id: I0c597edcb9563502dcb966b6a851bad1509884ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:23:11 +00:00
Chalard Jean
60896ef50a [automerger skipped] Disable tests that depend on the prebuilt version in U am: 202630d6c2 -s ours
am skip reason: Merged-In I2cbe990675b109e4ba744101dd7dbbb20229376f with SHA-1 a0e8ab4933 is already in history

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

Change-Id: I11bb7d710b9666df9f70a5903db0eec73d2710e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:23:09 +00:00
Jean Chalard
583d0d437a Merge changes Iab0ffbb5,I2cbe9906
* changes:
  Revert "Disable tests that depend on the prebuilt version in U"
  Disable tests that depend on the prebuilt version in U
2023-06-30 11:38:29 +00:00
Chalard Jean
5cb33401d5 Revert "Disable tests that depend on the prebuilt version in U"
This reverts commit 494e540a6a58f06ca74c237125fe49298e2163c4.
Test: are now reenabled

Change-Id: Iab0ffbb582120f057c31f6cb71a3cc06ba4a670a
2023-06-30 17:30:26 +09:00
Chalard Jean
202630d6c2 Disable tests that depend on the prebuilt version in U
This should be reverted as soon as it is merged into U
and the build request is submitted.

Bug: 286649301
Test: NetworkAgentTest, TH
Change-Id: I2cbe990675b109e4ba744101dd7dbbb20229376f
Merged-In: I2cbe990675b109e4ba744101dd7dbbb20229376f
2023-06-30 17:30:20 +09:00
Chalard Jean
4134c26ebf Evaluation delay = 8 secs for explicitly selected networks
When a network was explicitly selected, the user just tapped it and
is likely waiting for it to connect. A shorter timeout is therefore
more appropriate for these.

Bug: 281970908
Test: New test in ConnectivityServiceTest
(cherry picked from https://android-review.googlesource.com/q/commit:0f1413395df672328c3e77cccc0ca3600b2bec84)
Merged-In: I99a263960cbc9292868fc4bb46a4f3b2f3c71541
Change-Id: I99a263960cbc9292868fc4bb46a4f3b2f3c71541
Requested by Samsung for their upcoming U release
2023-06-30 17:09:28 +09:00
Chalard Jean
3bf3a59f35 Allow firing the LOST_INTERNET intent immediately in config
When config_notifyNoInternetAsDialogWhenHighPriority is on, the
LOST_INTERNET notification intent should be fired immediately
rather than as a pending intent.

Bug: 281970908
Test: Improve test for this in NetworkNotificationManagerTest
(cherry picked from https://android-review.googlesource.com/q/commit:e13b833b21342d80ef940783acba4b3eecfce968)
Merged-In: I88565839a12a1ab4b096f763250944ebaf6c5349
Change-Id: I88565839a12a1ab4b096f763250944ebaf6c5349
2023-06-30 17:09:28 +09:00
Chen Wang
cce653b327 Merge "Fix NearbyConfigurationTest." into udc-mainline-prod 2023-06-29 16:25:56 +00:00
Treehugger Robot
871627d5ec Merge "Add CTS for BidirectionalStream's getters" am: af2195deb1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2638302

Change-Id: I14b48bd7ada75873a31a8f6fcd0cffb0d1f17d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:02:08 +00:00
Treehugger Robot
af2195deb1 Merge "Add CTS for BidirectionalStream's getters" 2023-06-29 15:16:10 +00:00
chiachangwang
c5c5c84f4c Translate v4 keepalive packet on clat started network to v6
This commit translates the address of keepalive packet to v6
in order to make NATT keepalive work on v6 only network.

Sending a v4 NATT keepalive on a v6 only network is bogus if
hardware does not translate the packet automatically. Network
may drop the packet or reject the attempt by hardware. This
results in ERROR_INVALID_IP_ADDRESS and stop the keepalive
request.

Bug: 196453719
Test: atest FrameworksNetTests
Test: Manually connect to v6 only network and check if the
      keepalive packets are sent
Change-Id: I798c5d48661d8151b19902435732f465b5aa725b
2023-06-29 12:43:59 +00:00