Commit graph

109,858 commits

Message SHA1
Merge "Use SdkLevel.isAtLeastB() instead of SDK_INT" into main
Quang Luong   authored and   Gerrit Code Review   commited 2025-03-11 14:42:37 -07:00
b453055426
Merge "Only allow one pending bluetooth request at a time" into main
Quang Luong   authored and   Gerrit Code Review   commited 2025-03-11 14:39:30 -07:00
7fb9055ff3
Merge "Revert "Return the registry in registerNetworkAgent."" into main
Chaitanya Cheemala (xWF)   authored and   Gerrit Code Review   commited 2025-03-11 08:22:41 -07:00
82c551e08e
Revert "Return the registry in registerNetworkAgent."
This reverts commit 70ede3260c.

Reason for revert: Likely culprit for b/402365566 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If72cc264c5e505348309c6c11dbbfd11adeaf31b

Chaitanya Cheemala (xWF)   authored and   Gerrit Code Review   commited 2025-03-11 06:05:49 -07:00
846fb39e8a
[thread] loose the restrictions on ThreadNetworkManager APIs
1. We don't need to assert that ThreadNetworkManager is always null
   when the Thread hardware features are not present. There can be more
   useful Thread features which don't require the hardware
2. The getAllThreadNetworkControllers() API has no documentation says
   the returned list is guaranteed not empty.

Change-Id: Ie77110067ff670053a2125b30b2791b9f54b2582

Kangping Dong   commited 2025-03-11 20:58:51 +08:00
17740cb799
Merge changes from topic "thread-router" into main
* changes:
  [thread] refactor the settings module
  [thread] Support non-BR mode

Kangping Dong   authored and   Gerrit Code Review   commited 2025-03-11 03:37:36 -07:00
7cb5078ba1
Merge "Fix flaky tests of route propagation from netdata to tun interface in ThreadIntegrationTest" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-11 02:18:20 -07:00
c2eba15017
[thread] refactor the settings module
The current settings APIs have a few issues:
1. It doesn't support default value which is derived from resource
   overlays
2. It exposes the default values of settings entries as public APIs
   while they shouldn't be

Bug: 401654864

Change-Id: I1bbe3f14507a497320401f02fa6da512558fe385

Kangping Dong   commited 2025-03-11 17:09:29 +08:00
d9bbec2fa1
[thread] Support non-BR mode
This commit adds a resource overlay config for OEMs to disable the
Border Router feature by default. Also updates the tests to cover both
BR and non-BR use cases

Bug: 401654864
Change-Id: I7dd4363836269a08853b58304f62fe52f9021a9e

Kangping Dong   commited 2025-03-11 17:09:29 +08:00
82988c3d98
Use SdkLevel.isAtLeastB() instead of SDK_INT
Replace the explicit SDK_INT checks with the helper function
SdkLevel.isAtLeastB().

Bug: 216524590
Test: covered by existing tests
Change-Id: I32ae771d5b157d97dfbe3c37caf62e734eaa250e

Quang Anh Luong   commited 2025-03-11 17:16:56 +09:00
96f8e1b787
Fix flaky tests of route propagation from netdata to tun interface in ThreadIntegrationTest
Wait for route to be added/removed from link properties in the tests
instead of checking immediately, as it takes time for the change to
propagate from ot.

Bug: 401815392
Change-Id: Ie95f4beaa370514d31875b9f2e926762a38bc99e

Yang Sun   commited 2025-03-11 07:40:38 +00:00
82cdf67a19
Return the registry in registerNetworkAgent.
Also make the network agent registry two way to eliminate
reordering possibilities.

Test: ConnectivityCoverageTest, CtsNetTests
Change-Id: I0fd90716b9f5501bdcdc7ee5165321737a0076ae

Chalard Jean   commited 2025-03-11 16:26:17 +09:00
70ede3260c
Only allow one pending bluetooth request at a time
Currently there may be multiple identical bluetooth requests waiting for
the PAN service to connect before their listeners are notified. To
simplify future code, we should only allow one pending request/listener
pair at a time, and reject every subsequent request with
TETHER_ERROR_SERVICE_UNAVAILABLE.

This should be OK because
1) Bluetooth tethering is hardly used at all
2) Settings disallows extra startTethering calls between the first call
   and the bluetooth service starting
3) Apps are expected to handle TETHER_ERROR_SERVICE_UNAVAILABLE
   correctly.

Bug: 216524590
Test: atest TetheringTest
Change-Id: I8375d495575715f428e893316f7cd7e5a7ebba59

Quang Anh Luong   authored and   Quang Luong   commited 2025-03-10 21:02:50 -07:00
d1f8cea4df
Merge "testTetherBpfOffloadUdpV4: disable on S/Sv2 with old DnsResolver" into main
Maciej Ĺ»enczykowski   authored and   Gerrit Code Review   commited 2025-03-10 18:30:24 -07:00
520093b251
Merge "Ensure APF counter increased for testDropPingReply() and testReplyPing()" into main
Maciej Ĺ»enczykowski   authored and   Gerrit Code Review   commited 2025-03-10 16:23:06 -07:00
e85288d628
testTetherBpfOffloadUdpV4: disable on S/Sv2 with old DnsResolver
This mirrors the bpf_existence_test check:

https://source.corp.google.com/h/android/platform/superproject/main/+/main:packages/modules/Connectivity/bpf/tests/mts/bpf_existence_test.cpp;drc=0b477491fb95c04d908ef83d683c42db9102cf40;l=203


Bug: 401312619
Test: TreeHugger, atest EthernetTetheringTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I95020580655f8ff6b1e8c26bc3f26b4823716dd5

Maciej Ĺ»enczykowski   commited 2025-03-10 15:53:48 -07:00
bf2c498642
Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main
Xin Li   authored and   Gerrit Code Review   commited 2025-03-10 09:51:44 -07:00
db5bc268e2
Merge "Specify the expected VPN network callbacks." into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-10 02:29:53 -07:00
cd4258dcb1
Specify the expected VPN network callbacks.
The test expects validated VPN network callbacks. However, an
unexpected Wi-Fi link bandwidth change during the test introduces
flakiness. To enhance test stability, specify the expected
callbacks to reduce flakiness.

Bug: 401489016
Test: atest CtsHostsideNetworkTests --iteration
Change-Id: I152ba5a4ff6c4a124db820f0eb58bb057e4dee5b

Paul Hu   commited 2025-03-10 08:09:00 +00:00
8217a0e760
Merge "skip the country code test when the country code is not support" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-09 21:49:10 -07:00
749898bb1e
Merge "Enable early native network creation for local network" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-09 20:53:11 -07:00
daa1f52b02
Enable early native network creation for local network
This is needed by tethering local network feature, given that
the IpServer needs to setup forwarding after native network
creation and before signaling network availability.

Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      ConnectivityCoverageTests:android.net.EthernetTetheringTest \
      ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest \
      --update-device
Bug: 349487600
Change-Id: I2bc2ec355e01be661b587406bd127dff11665047

Junyu Lai   commited 2025-03-10 10:31:11 +08:00
91ef9d38e3
skip the country code test when the country code is not support
Setting country code is not a must support feature on all platforms.
This commit skips the country code related tests when the platform
doesn't support setting the country code.

Bug: b/401793629
Test: atest ThreadNetworkIntegrationTests

Change-Id: I6bb8444f70afb2635d7791af2128741bc02e8ff3

Zhanglong Xia   commited 2025-03-10 02:22:21 +00:00
38aa51aaf2
Merge "Fix wrong condition for blocked status tracking wtf log" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2025-03-09 16:44:22 -07:00
f498a21182
Merge 25Q1 (ab/BP1A.250305.020) to AOSP main
Bug: 385190204
Merged-In: Iffd55b9463cfb5c058fbb794f373a9c616393574
Change-Id: I48460b235a0e39cfd0ed4d8d1941ec6a91f7a804

Xin Li   commited 2025-03-08 16:09:58 -08:00
74ba33c222
Ensure APF counter increased for testDropPingReply() and testReplyPing()
Bug: 369354847
Test: atest ApfIntegrationTest
Change-Id: I2c28bfef75ae657663d43a21e051c002368c3448

Jimi Chen   commited 2025-03-07 13:16:30 +00:00
70b4577a64
Merge changes I6d0e5d34,I55af0796 into main am: 75551afe7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3526891

Change-Id: Id2490f4835aac74b056294dfe1325c99e2bac1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Junyu Lai   authored and   Automerger Merge Worker   commited 2025-03-06 23:15:56 -08:00
05757ef267
Merge changes I6d0e5d34,I55af0796 into main
* changes:
  Inline tetherInterface and untetherInterface
  Separate route modification and update linkproperties

Junyu Lai   authored and   Gerrit Code Review   commited 2025-03-06 22:43:51 -08:00
75551afe7a
Merge "Stop using Mockito static mocking in BpfDumpTest" into main am: 1d1cc3a36d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3516753

Change-Id: I049d1738f808292163cdfd69ba908c1dbd201d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2025-03-06 20:27:20 -08:00
62a04fe25b
Merge "Stop using Mockito static mocking in BpfDumpTest" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2025-03-06 19:50:26 -08:00
1d1cc3a36d
Merge "Create the DiscoveryExecutor Class" into main am: b153713418
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3342194

Change-Id: I60760bc8a9a3f3d8c3f8a5d5426ca5d0edbf10dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2025-03-06 19:26:27 -08:00
677aa3c110
Merge "Create the DiscoveryExecutor Class" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-06 19:02:14 -08:00
b153713418
Inline tetherInterface and untetherInterface
This is a no-op refactoring which inline the functionalities
to IpServer, enabling subsequent changes to move
networkAddInterface part to ConnectivityService when the
tethering is enabled.

Test: atest TetheringTests:android.net.ip.IpServerTest
      atest NetdStaticLibTests:com.android.net.module.util.NetdUtilsTest
Bug: 349487600

Change-Id: I6d0e5d349691df7a15bee852d5fd1dd19f5da6f6

Junyu Lai   commited 2025-03-07 10:43:17 +08:00
eff5782b0a
Separate route modification and update linkproperties
This is a no-op, preparatory refactoring to isolate route
modification functionality, enabling subsequent changes to move
routing control to ConnectivityService.

Test: atest TetheringTests:android.net.ip.IpServerTest
      atest NetdStaticLibTests:com.android.net.module.util.NetdUtilsTest
Bug: 349487600
Change-Id: I55af07968567b173dd9f97795600390439f1b927

Junyu Lai   commited 2025-03-07 10:43:17 +08:00
d85d3c5e80
Merge "Use 'ip link' to prevent permission errors in non-root environments" into main am: a7b9afbbfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527296

Change-Id: Iffe17b3846bc98d635a5428bc8343dee30c7cb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jimi Chen   authored and   Automerger Merge Worker   commited 2025-03-06 17:26:17 -08:00
80610e3319
Merge "Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future" into aosp-main-future
Xin Li   authored and   Android (Google) Code Review   commited 2025-03-06 17:05:38 -08:00
0cb66ebb03
Merge "Use 'ip link' to prevent permission errors in non-root environments" into main
Jimi Chen   authored and   Gerrit Code Review   commited 2025-03-06 16:31:21 -08:00
a7b9afbbfa
Use 'ip link' to prevent permission errors in non-root environments
The 'ip link show' requires root permissions, causing errors.
This change replaces 'ip link show' with 'ip link'.

Bug: 401123634
Test: atest NetworkStaticLibHostPythonTests
Change-Id: I82b219ae9179f23e3233f797aeb4aa3740e6d3ec

Jimi Chen   commited 2025-03-07 00:25:34 +00:00
c471fc945c
Merge "Revert^2 "Use timerfd to improve the accuracy of query timing"" into main am: c23d94f2cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3433510

Change-Id: I07833562ad5b5112cd00ffd4bf2d8959db045a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2025-03-06 13:15:51 -08:00
867d0b0476
Merge "Revert^2 "Use timerfd to improve the accuracy of query timing"" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-06 12:52:13 -08:00
c23d94f2cc
Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
Bug: 385190204
Merged-In: Ibbba520f24e88f3dcbafd925aa8da319824377ad
Change-Id: Ib840c52538deb29ca92245d320d49405f45d2957

Xin Li   commited 2025-03-06 12:22:42 -08:00
e671fc9e06
Create the DiscoveryExecutor Class
This is a no-op refactor. Move the DiscoveryExecutor from
MdnsDiscoveryManager to a standalone class for subsequent
changes.

Bug: 366373064
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: Idbfbbb423ddfe78a37db1b189aef945401b0a1e9

Paul Hu   commited 2025-03-06 15:13:44 +00:00
bca2d037a9
Revert^2 "Use timerfd to improve the accuracy of query timing"
This reverts commit a481dc184f.

Reason for revert: Update this change to ensure proper closure of the timerfd object.

Change-Id: I14530ba77a39c77b4c7af6855ec77ba4907ab9f9

Paul Hu   commited 2025-03-06 15:13:12 +00:00
a3a34058fe
Merge "Add config_nsdOffloadServicesDenyList to NsdService" into main am: 648d01b9f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3513113

Change-Id: I55cc54d6d1778c5d2248817bcfdc5be020b1e3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yuyang Huang   authored and   Automerger Merge Worker   commited 2025-03-06 06:37:43 -08:00
747dd1deb3
Merge "Add config_nsdOffloadServicesDenyList to NsdService" into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2025-03-06 06:10:06 -08:00
648d01b9f4
Add config_nsdOffloadServicesDenyList to NsdService
This commit introduces the config_nsdOffloadServicesDenyList to
NsdService to allow OEMs to specify services that should not be
offloaded. This feature addresses potential memory limitations by
enabling selective offloading, providing OEMs with greater control over
resource management.

Test: TH
Change-Id: I846e7cfc37c3a71c50853707884cf0c0a9a6f971

Yuyang Huang   commited 2025-03-06 21:30:21 +09:00
9b0f749723
Merge "Add libbpf version to bpf loader initial log" into main am: 5977f5ce7c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3475677

Change-Id: I59f7951176d183c3b773e5f648efb2c03d51f59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2025-03-06 03:01:52 -08:00
b007e4825b
Merge "Add libbpf version to bpf loader initial log" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2025-03-06 02:32:19 -08:00
5977f5ce7c
Merge "Allow bpfloader to use libbpf" into main am: fb8903013e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3475676

Change-Id: I398ff51a1840aea4beb033beaa4998abceff68b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2025-03-06 02:14:44 -08:00
7c3dd2db4e
Merge "Allow bpfloader to use libbpf" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2025-03-06 01:41:28 -08:00
fb8903013e