Fix flaky test for trel service discovery am: ffd3986c99
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3536080
Change-Id: I8473b80dcea4c2814908fc58bd459b4cda3b66ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yang Sun
authored and
Automerger Merge Worker
commited 2025-03-12 02:20:44 -07:00
986a6deca4
Fix flaky test for trel service discovery
...
When checking for trel services published by a BR, we need to filter the
services by their service name, since there might be other devices
publishing trel service at the same time.
Bug: 399518677
Change-Id: I56518dbe6c79b48aa048073d8556a53e1261e8bd
Yang Sun
commited 2025-03-12 07:18:16 +00:00
ffd3986c99
Merge "Use non-extended mockito for net-tests-utils" into main am: ec2a5cc5c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3530432
Change-Id: I21c684067253b86c3e36e7863b5cbdfc25e138d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2025-03-11 19:23:44 -07:00
f461ec9757
Merge "Use non-extended mockito for net-tests-utils" into main
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2025-03-11 19:00:20 -07:00
ec2a5cc5c5
Merge "Use SdkLevel.isAtLeastB() instead of SDK_INT" into main am: b453055426
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535279
Change-Id: I3106560464c886df0b7764b57fe7935003dd61cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Quang Luong
authored and
Automerger Merge Worker
commited 2025-03-11 15:04:20 -07:00
db67ad9102
Merge "Only allow one pending bluetooth request at a time" into main am: 7fb9055ff3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3529935
Change-Id: I0fd7325fcc76ee549ae76e3c24dbcd43ac169139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Quang Luong
authored and
Automerger Merge Worker
commited 2025-03-11 15:04:01 -07:00
61137d7d56
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 am: 82c551e08e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535263
Change-Id: I55bebcf99fef97c4d2d5d6a9b0ad680396586db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chaitanya Cheemala (xWF)
authored and
Automerger Merge Worker
commited 2025-03-11 08:50:32 -07:00
60670b309d
[thread] loose the restrictions on ThreadNetworkManager APIs am: 17740cb799
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535262
Change-Id: Ibedb1a521b788d30bd0479bbe88dca50104f2555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Kangping Dong
authored and
Automerger Merge Worker
commited 2025-03-11 08:50:17 -07:00
aa40feb10f
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 am: 7cb5078ba1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527441
Change-Id: Ic216cf9fb1c8e5bf3714e08aca42152f27d12d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Kangping Dong
authored and
Automerger Merge Worker
commited 2025-03-11 04:06:28 -07:00
d6a125c334
[thread] Support non-BR mode am: 82988c3d98
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3532110
Change-Id: I7c5d33adf7f965e84b45293714fac213b2400f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Kangping Dong
authored and
Automerger Merge Worker
commited 2025-03-11 04:06:22 -07:00
931e27df25
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 am: c2eba15017
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535179
Change-Id: Id76246e20db360830c917ca444acfb71b7d19295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-11 02:22:45 -07:00
f10dcba6c2
Return the registry in registerNetworkAgent. am: 70ede3260c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3530572
Change-Id: I86db088ae80a30122388fb9d7e9d83faf7818584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2025-03-11 02:22:33 -07:00
a3338e5aeb
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] 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
[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
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 am: 520093b251
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3534159
Change-Id: I35f971dcfbed6185d6846afc5b13e4ad0a856d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2025-03-10 19:00:01 -07:00
3bcb019ca3
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 am: e85288d628
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3529967
Change-Id: I2ddbc868039e01bd7665451672cc886261402bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2025-03-10 17:04:45 -07:00
eda5d9493d
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 am: db5bc268e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3526891
Change-Id: I46fd0ba8e7224e361b7da6b64c492e46ddbcdc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xin Li
authored and
Automerger Merge Worker
commited 2025-03-10 11:21:26 -07:00
a10d20a060
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 am: cd4258dcb1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3532950
Change-Id: I0f993b774d9a9339f5f633419633e0e4051f787e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-10 02:59:17 -07:00
00509b52fe
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
Use non-extended mockito for net-tests-utils
...
Mockito extended tends to cause all kinds of issues due to the way it
injects itself into the bytecode of framework classes instead of
creating subclasses.
Use non-extended mockito as it is not actually necessary for current
tests.
Test: atest
Change-Id: Id2874309cce2778c4405b852df9a3ae816c4abcb
Remi NGUYEN VAN
commited 2025-03-10 17:59:19 +09:00
05c376a4c5
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 am: 749898bb1e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527435
Change-Id: I2ee35c6ec96b63ab5b95c365aa847425a1fbd962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-09 22:53:47 -07:00
17780ae4bf
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 am: daa1f52b02
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3526892
Change-Id: Iffce67f2b702d7145f0490da001f9060678ff83e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-09 21:22:21 -07:00
08256f7c14
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 am: f498a21182
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3477913
Change-Id: Ieff49fe1503427d6fc58b17879b46af765a4ed11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2025-03-09 17:56:23 -07:00
1523f3a22f
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