Commit Graph

10985 Commits

Author SHA1 Message Date
Treehugger Robot
df5f4b8142 Merge "Revert "Always disconnect agents immediately."" am: fd7fa4ede9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2639633

Change-Id: Iebe4a93c39458becb70c960adcc70b0612ed0201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 12:42:36 +00:00
Treehugger Robot
fd7fa4ede9 Merge "Revert "Always disconnect agents immediately."" 2023-06-27 12:06:45 +00:00
Paul Hu
628b644e72 Merge "Address leftover comments" am: 0068ec2765
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629431

Change-Id: Ia3713ac1097ab933e797edf11a1a91820fcaddef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 11:34:54 +00:00
Chalard Jean
a16607f421 Never create native network immediately.
This patch flags off the functionality added by aosp/2162425
in the wake of b/286649301 where a race in ConnectivityService
breaks WiFi connectivity until reboot.

Bug: 286649301
Test: NetworkAgentTest
      ConnectivityServiceTest
Change-Id: I96d755445f6e1f88bb71a7d32742e87dae185250
2023-06-27 20:05:20 +09:00
Paul Hu
0068ec2765 Merge "Address leftover comments" 2023-06-27 10:57:54 +00:00
Jean Chalard
3160bc0825 Revert "Always disconnect agents immediately."
This reverts commit 4bc9fa6b8c.

Reason for revert: b/288450518

Some iterations over mNetworkAgentInfos result in networks being
disconnected, which removes them from mNetworkAgentInfos during
iteration. This crashes with NPE or OOB exceptions.

Bug: 286649301
Bug: 288149251
Bug: 288450518
Change-Id: I6e0b5b614d9e88267db77cb807ae4bf09f88c0f6
2023-06-27 19:19:11 +09:00
Paul Hu
5b855bcbab Merge "Send packets on the specific socket" am: 03aabc0d78
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606783

Change-Id: I4c0b0388e4e869fd67b1f941bd388421e612dcde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:47:18 +00:00
Jean Chalard
882a4dc842 Merge "Evaluation delay = 8 secs for explicitly selected networks" am: 56d484c6e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2614893

Change-Id: I51cf21f8fcb4712a68f76f5ba2f2dc0f47970f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:47:04 +00:00
Jean Chalard
5bb9271374 Merge "Allow firing the LOST_INTERNET intent immediately in config" am: 1acb331613
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2614894

Change-Id: I1a4603abb5c996879a0132210cbb6ab779f9566b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:46:50 +00:00
Paul Hu
03aabc0d78 Merge "Send packets on the specific socket" 2023-06-27 05:40:38 +00:00
Jean Chalard
56d484c6e5 Merge "Evaluation delay = 8 secs for explicitly selected networks" 2023-06-27 05:15:16 +00:00
Jean Chalard
1acb331613 Merge "Allow firing the LOST_INTERNET intent immediately in config" 2023-06-27 05:14:44 +00:00
Paul Hu
070007164c Address leftover comments
Address leftover comments on aosp/2596565 & aosp/2593907 includes
- Rename onAllSocketsDestroyed to onSocketDestroyed
- Move SocketKey into SocketInfo
- Remove getInterfaceIndex dependency.

Bug: 278018903
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Change-Id: Ia37804f18d8e9abbd12d4b929b71dce5fa19d4f0
2023-06-26 14:19:05 +00:00
Paul Hu
721f9b28bf Send packets on the specific socket
In the previous design, the network could be null for some
MdnsServiceTypeClient (tethering interfaces). However, the
MdnsMultinetworkSocketClient is designed to send packets on
specific networks. This means that if there are multiple
tethering interfaces, packets will be sent to unnecessary
sockets. Now, the MdnsServiceTypeClient is created by the socket,
which can identify which socket is the target for sending
packets. Therefore, the design should be updated to send packets
only on the specific socket.

Bug: 278018903
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Change-Id: Id87e6d202599c57620281a6761d3c56acd2c929c
2023-06-26 13:27:47 +00:00
Mike Yu
cc5dbf951d Exclude some DnsResolverTest tests from some CtsNetTestCasesLatestSdk
Some DnsResolverTest tests are flaky because CtsNetTestCasesLatestSdk
doesn't run with the latest resolv module that has some DoH/DoT fixes.

In this change:
1. The DnsResolverTest tests that do DNS lookups (which probably use
   private DNS) and check the results are marked as DnsResolverModuleTest
2. Exclude those tests from mainline-presubmit CtsNetTestCasesLatestSdk
   that doesn't run with the latest resolv module.

Bug: 279846955
Test: TreeHugger
Change-Id: I86942c22195132a5c96e838619c8bcfaaedc7c99
2023-06-26 07:40:06 +00:00
Jean Chalard
efd7a3e313 Merge changes I943d4efb,I02378125,I2ee4ae52 am: 3a093baccb am: b2c2553304 am: 4f134ef21c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628994

Change-Id: Iff29b090c0b41d0103997a80788f09c2602df074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 13:24:37 +00:00
Jean Chalard
13995b1bf9 Merge changes I943d4efb,I02378125,I2ee4ae52 am: 3a093baccb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628994

Change-Id: Iede0d666ed46a69d322e7a4117b5e07173c8df6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 11:50:07 +00:00
Jean Chalard
3a093baccb Merge changes I943d4efb,I02378125,I2ee4ae52
* changes:
  Reset the generated v6 clat address when stop
  Add helper method to translate v4 address pair to clat v6
  Add methods to provide clat source address
2023-06-22 11:07:59 +00:00
Remi NGUYEN VAN
2d5710f905 Merge "Set test component in common OWNERS" am: f33c453826 am: 26d265a6fe am: bdbbadb4df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632189

Change-Id: I73942a6247c593ebb48db136690b94c591b4b8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 10:24:12 +00:00
Remi NGUYEN VAN
0a811d7f3d Merge "Set test component in common OWNERS" am: f33c453826
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632189

Change-Id: If6b9b55947902717ab5b20e24fbaefe2794cea91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:49:26 +00:00
Remi NGUYEN VAN
f33c453826 Merge "Set test component in common OWNERS" 2023-06-22 08:14:59 +00:00
Chalard Jean
e13b833b21 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
Change-Id: I88565839a12a1ab4b096f763250944ebaf6c5349
2023-06-22 15:03:10 +09:00
Remi NGUYEN VAN
4f3cac0f14 Replace connectToWifi with ensureWifiConnected am: 0828c6e0f2 am: 004e74dd8c am: dff1922f5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632990

Change-Id: I32c0f78038e1d0bae238d5734cbb0363d1d53547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 05:29:00 +00:00
Remi NGUYEN VAN
8561dc558d Replace connectToWifi with ensureWifiConnected am: 0828c6e0f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632990

Change-Id: Ie118e67239d2622143e9a2870290792f5ca2e551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 03:54:59 +00:00
Remi NGUYEN VAN
0828c6e0f2 Replace connectToWifi with ensureWifiConnected
connectToWifi expects a CONNECTIVITY_ACTION broadcast, which
may not be received if wifi is already connected.

There is already a separate test exercising the broadcast,
testToggleWifiConnectivityAction.

Bug: 283272115
Change-Id: I21a358fcb119878969eb898e15fea9da1af9a108
Test: TH
2023-06-22 01:42:47 +00:00
chiachangwang
b3eccf7b8a Reset the generated v6 clat address when stop
The v6 address is generated from the prefix when clat is started.
The address should be reset when clat is stop.

Test: atest FrameworksNetTests
Change-Id: I943d4efba85dda556dd1ec852322caaf9470e87b
2023-06-21 06:43:28 +00:00
Paul Hu
c49ae29f86 Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d am: 04768129ec am: 1c7af8b0a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624375

Change-Id: Ibc9b32188ef5fa373f679118828ccb93e02118bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:08:39 +00:00
Motomu Utsumi
3c476f3c79 Merge "Skip testDefaultNetworkActiveListener on R devices." am: 3d153f9a89 am: 3a1e5d1a0f am: 59dfab0980
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624371

Change-Id: I25374347528c2be0be858c352b75382c08f9c618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:07:36 +00:00
Paul Hu
9fe2e6571f Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624375

Change-Id: Ie2c04ee7f2f2925fb48821390a962d57d75cfad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 04:36:21 +00:00
Motomu Utsumi
ea5b5bdaa5 Merge "Skip testDefaultNetworkActiveListener on R devices." am: 3d153f9a89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624371

Change-Id: Id6857f7f5d7ba533d514a8363182789e1429682d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 04:36:06 +00:00
Paul Hu
b063daea6d Merge "Fix flaky test: testMobileDataPreferredUids" 2023-06-21 04:23:50 +00:00
Motomu Utsumi
3d153f9a89 Merge "Skip testDefaultNetworkActiveListener on R devices." 2023-06-21 04:06:33 +00:00
Remi NGUYEN VAN
64020abf11 Set test component in common OWNERS
Move the test component configuration from subdirectories
to the common OWNERS file. This ensures that all test directories
like unit/ that did not have the component set are covered.

Bug: 288137916
Change-Id: I48fbe846309cace41588c5ff3dfd46e878c38576
Test: TH
2023-06-21 02:54:13 +00:00
Abdelrahman Ibrahim
65e78050c6 Merge "Guard the usage of PacProxyManager when it is not supported by the device." am: 76f61bb2e8 am: 89c7b7db4e am: b92e07b760
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2623371

Change-Id: Iec75d57529f6eb0ac17c98650b4668cfeef1775c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:52:03 +00:00
Abdelrahman Ibrahim
163a222fc4 Merge "Guard the usage of PacProxyManager when it is not supported by the device." am: 76f61bb2e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2623371

Change-Id: I585b3febafba579f9d6914980d60ee5b85eb99ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:03:20 +00:00
Abdelrahman Ibrahim
76f61bb2e8 Merge "Guard the usage of PacProxyManager when it is not supported by the device." 2023-06-20 16:35:56 +00:00
Chalard Jean
0f1413395d 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
Change-Id: I99a263960cbc9292868fc4bb46a4f3b2f3c71541
2023-06-20 18:48:39 +09:00
Motomu Utsumi
e702f985c6 Merge "Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior" am: e0365d45ca am: dd0653ee79 am: 57073a67e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605757

Change-Id: If869b552a4b7c59a088e8eae657683364f7105c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 02:59:04 +00:00
Motomu Utsumi
c2d4170b6f Merge "Add test for default network activity APIs" am: 0d56157186 am: d41a3fc42d am: 9d2070cebe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2573990

Change-Id: I3138c6d56199a25e508817ba488f4981967a5e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 02:57:53 +00:00
Motomu Utsumi
4ddf49ebc2 Merge "Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior" am: e0365d45ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605757

Change-Id: I41102bf345f441568f99d712b6f4a665bf136a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 01:22:10 +00:00
Motomu Utsumi
64636b56a7 Merge "Add test for default network activity APIs" am: 0d56157186
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2573990

Change-Id: I288169bf1e156382d49a763faba1fd03e5c632b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 01:20:59 +00:00
Motomu Utsumi
e0365d45ca Merge "Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior" 2023-06-20 01:00:24 +00:00
Motomu Utsumi
6225d57b18 Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior
This CL changes the behavior as follows.

Before this CL, isDefaultNetworkActive returns true if there is no
default network.
After this CL, isDefaultNetworkActive returns false if there is no
default network on all releases.

Before this CL, LegacyNetworkActivityTracker does not call
onNetworkActive callback for networks that tracker does not add the idle
timer to (e.g.  ethernet, cell network configured with activity tracking
disabled).
After this CL,
On T-, onNetworkActive keeps the current behavior.
On U+, onNetworkActive is called regardless of the idle timer existence. This behavior is consistent with ConnectivityManager#isDefaultNetworkActive, which always returns true for a network that has no activity tracking.

Bug: 267870186
Bug: 279380356
Test: atest FrameworksNetTests
Change-Id: I7b1d493fea0ab028b53a3d640a58a00ebbdcc143
2023-06-20 00:59:46 +00:00
Motomu Utsumi
0d56157186 Merge "Add test for default network activity APIs" 2023-06-20 00:44:01 +00:00
Cassie Wang
dfe37ce169 Merge "Add checks around CONTROL_VPN permission during prepare()" am: 04f3dc871d am: e9c82f087a am: b47252b556
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624812

Change-Id: I393918cab9804d0f9340d1fe6bb13fc33c888de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 13:33:24 +00:00
Cassie Wang
af3b8ffd08 Merge "Add checks around CONTROL_VPN permission during prepare()" am: 04f3dc871d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624812

Change-Id: I70149ca5ba91b053cdd004b2698f0b186d630ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 12:05:45 +00:00
Cassie Wang
04f3dc871d Merge "Add checks around CONTROL_VPN permission during prepare()" 2023-06-19 11:38:23 +00:00
Hansen Kurli
d92bd2a45f Merge "Have paused keepalives keep their hardware slot" am: 95386feff1 am: e82e214570 am: 2598bf2374
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600007

Change-Id: I1d921725e8bc3661b7a1e37ead54722aa3bf2762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 09:39:47 +00:00
Mark Chien
fa50908721 Merge "Diable ConnectivityManagerTest#testFactoryReset" am: 8c59e582a5 am: 849fcba7ae am: f95243c8c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629809

Change-Id: Ia9b19e16329bb6a2b7a1c731c6f09faf077590e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 09:39:36 +00:00
chiachangwang
bc37c03b8e Correct the namespace of DeviceConfig in VpnTest am: d64b2b1bdd am: e8889a4589 am: 0c93c9d1f5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629811

Change-Id: I31c4cac02731851d51fd8210deae553763d47f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 09:39:13 +00:00