joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
93,143 commits 1 branch 0 tags 204 MiB
Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
Merge "Revert "Prioritize non-slices over slices"" into main am: 11162e97c6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840317

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-24 03:26:47 +00:00
6454939961
Merge "Revert "Prioritize non-slices over slices"" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-24 02:50:35 +00:00
11162e97c6
Merge "Add Thread#join to guarantee the termination of the thread" into main am: 976e52a2c4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840316

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-11-22 06:26:31 +00:00
3fc8be92fb
Merge "Add Thread#join to guarantee the termination of the thread" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-11-22 06:22:23 +00:00
976e52a2c4
Merge "Fix the memory leak in nsd tests" into main am: 005fb887e6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814218

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-11-22 03:03:00 +00:00
23e7336673
Merge "Fix the memory leak in nsd tests" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-11-22 02:57:24 +00:00
005fb887e6
Merge "Update Andorid.bp to use DnsResolver v13" into main am: faa10d066b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452966

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

Mike Yu   authored and   Automerger Merge Worker   commited 2023-11-21 12:37:56 +00:00
aa8b19e205
Merge "Update Andorid.bp to use DnsResolver v13" into main
Mike Yu   authored and   Gerrit Code Review   commited 2023-11-21 12:04:30 +00:00
faa10d066b
Revert "Prioritize non-slices over slices" 
This reverts commit 14499f0119.

Reason for revert: b/312408745

Change-Id: I8b03799fe6e0e256263240909ee7446c178bf508

Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-21 10:25:14 +00:00
6121a7656c
Add Thread#join to guarantee the termination of the thread 
Also add MonitorThreadLeak annotation to check thread leak.

Test: atest ConnectivityCoverageTests --test-filter mdns*
Change-Id: Ie47f30360e36784428173f6cc87a4a6b09826405

Paul Hu   commited 2023-11-21 16:08:41 +08:00
0788d8ee7e
Fix the memory leak in nsd tests 
The NsdManager constructor creates a new thread, which is not
intended to be closed. However, the test in NsdMangerTest and
NsdServiceTest create a new NsdManager instance, resulting in a
large number of threads running during the tests. This can lead
to an out-of-memory error for the tests. To resolve this issue,
use the common singleton thread ConnectivityThread to handle
tasks from the various instances.

Fix: 308544734
Test: atest ConnectivityCoverageTests --test-filter Nsd*
Change-Id: I1908a2bb1bd20da8e0498353bca26f7e89e16626

Paul Hu   commited 2023-11-21 14:04:07 +08:00
27662f0cc3
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main am: 4a013c47c2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824211

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-20 07:27:47 +00:00
a067200ebd
Stop CarrierPrivilegeAuthenticator thread in tests am: 96ff954464 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814217

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

Chalard Jean   authored and   Automerger Merge Worker   commited 2023-11-20 07:27:34 +00:00
018b9ada56
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main 
* changes:
  Rename hasCarrierPrivilege... to isCarrierServiceUid...
  Detect discrepancies in subIds
  Allow carrier service UIDs to access their own WiFi networks.

Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-20 06:55:04 +00:00
4a013c47c2
Stop CarrierPrivilegeAuthenticator thread in tests 
Bug: 308519360
Test: CarrierPrivilegeAuthenticatorTest
Change-Id: I59164be00a9e1fcced8538537c1dcabd214f2170

Chalard Jean   commited 2023-11-20 14:31:32 +09:00
96ff954464
Merge "Add more powerful CTS for allowedUids" into main am: 51c80a72d8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405720

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-20 05:17:27 +00:00
bd402334a8
Rename hasCarrierPrivilege... to isCarrierServiceUid... 
This method tests whether the UID is the carrier service
UID, not whether the UID has carrier privilege.

Note that in normal operation, the carrier service UID always
has carrier privilege.

Test: NetworkAgentTest
Change-Id: I30f8814cc0419a2d6bdbe75fdc82156516eba026

Chalard Jean   commited 2023-11-20 14:01:02 +09:00
8c63ed851f
Allow carrier service UIDs to access their own WiFi networks. 
Bug: 236669534
Test: New tests in this patch
Change-Id: If312b8f8359888558969c022811d6b203be602a0

Chalard Jean   commited 2023-11-20 14:01:02 +09:00
a093b452f3
Merge "Add more powerful CTS for allowedUids" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-20 04:44:22 +00:00
51c80a72d8
Add more powerful CTS for allowedUids 
This tests that the network providers are subject to appropriate
limitations as to what they can set as allowedUids – both in the
positive (can do) case, and the negative (can't do) case.

Test: this
Change-Id: I115e2a4bc02ddcd03ecf2f35130fcb0378da22bd

Chalard Jean   commited 2023-11-20 12:16:39 +09:00
5301778ad8
Update Andorid.bp to use DnsResolver v13 
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I92ab5e1eef7ba1715176e3628222084067d14603

Mike Yu   commited 2023-11-20 01:48:53 +00:00
d0ad17c2d1
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main am: dec578072a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836091

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

MichaÅ‚ BrzeziÅ„ski   authored and   Automerger Merge Worker   commited 2023-11-17 12:59:30 +00:00
fdd105d2c2
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main
MichaÅ‚ BrzeziÅ„ski   authored and   Gerrit Code Review   commited 2023-11-17 12:21:56 +00:00
dec578072a
Revert "Make PRIORITIZE_* networks non-default" 
This reverts commit 30fb9b1ca4.

Reason for revert: Potential culprit for CtsLibcoreTestCases test failures b/311612650

Change-Id: Ie7de97159f92a174476a8fa8ea83e3e01914aea1

MichaÅ‚ BrzeziÅ„ski   authored and   Gerrit Code Review   commited 2023-11-17 11:18:56 +00:00
05cba24cd8
Merge "Update test as the parameters are removed from production code" into main am: 35c1bc4fbb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2834370

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-11-17 09:13:10 +00:00
a4f44726c4
Merge "Update test as the parameters are removed from production code" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-11-17 08:55:12 +00:00
35c1bc4fbb
Merge "Make PRIORITIZE_* networks non-default" into main am: 9a5252ba50 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761506

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-17 06:13:32 +00:00
75c7d92ba6
Merge "Make PRIORITIZE_* networks non-default" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-17 05:55:22 +00:00
9a5252ba50
Update test as the parameters are removed from production code 
Bug: 161776767
Test: atest FrameworksNetTests
Change-Id: Id2cef626c5893a4ff29161c801e497b7de551136

Chiachang Wang   commited 2023-11-17 01:25:22 +00:00
a34e045610
Merge "Test VpnProfile is not modified in startLegacyVpn" into main am: 77f9fb300f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2831650

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

Hansen Kurli   authored and   Automerger Merge Worker   commited 2023-11-16 10:28:24 +00:00
0a7ce289cb
Merge "Test VpnProfile is not modified in startLegacyVpn" into main
Hansen Kurli   authored and   Gerrit Code Review   commited 2023-11-16 10:04:19 +00:00
77f9fb300f
Make PRIORITIZE_* networks non-default 
As a specialized network, a network with PRIORITIZE_* is not
generally a good default network, and might cause unexpected
charges if allowed to become one.

Test: CSDefaultNetworkTests
Change-Id: I8f7184f80bb987da720bd067862bd7a546a38e26

Chalard Jean   commited 2023-11-16 18:45:10 +09:00
30fb9b1ca4
Merge "Add test for verifying if setVpnDefaultForUids() is called correctly" into main am: dff6b91649 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2375261

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-11-16 06:55:41 +00:00
f12c1ac90c
Merge "Add test for verifying if setVpnDefaultForUids() is called correctly" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-11-16 06:16:11 +00:00
dff6b91649
Merge "Use FromS() on LocalNetworkConfig" into main am: cc2e72735d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2830050

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-16 05:14:57 +00:00
b24131565f
Merge "Use FromS() on LocalNetworkConfig" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-16 04:45:15 +00:00
cc2e72735d
Test VpnProfile is not modified in startLegacyVpn 
The profile is modified within startLegacyVpnPrivileged(), e.g.
ipsecCaCert, ipsecUserCert. This causes subsequent calls from
callers such as LockdownVpnTracker to fail.

Add a new test to ensure the VpnProfile is not modified in
startLegacyVpn.
Add testClone in VpnProfileTest.

Bug: 190572822
Bug: 309591931
Test: atest FrameworksNetTests, test before and after fix.
Test: Manual test
Change-Id: Id090e0dd3b9e74a7461ae90e68c41e802b458744

Hansen Kurli   commited 2023-11-16 12:28:12 +08:00
e949124bcc
Add test for verifying if setVpnDefaultForUids() is called correctly 
This commit verifies that
- If VPN network preference is set when
    - Ikev2VpnRunner is created
    - Retrying VPN
    - Updating exclusion list
- If VPN network preference is cleared when
    - Exiting VPN runner
    - NOT_RECOVERABLE happens

Bug: 231749077
Test: atest FrameworksNetTests:VpnTest
Change-Id: I71f48f18fd4556e04c131d5939afaa1ef5a0f814

lucaslin   authored and   Hansen Kurli   commited 2023-11-16 12:03:13 +08:00
cca1652bdb
Merge "Pass VPN uid range to AutomaticOnOffKeepaliveTracker" into main am: 9481063d42 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2831531

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-11-16 02:00:04 +00:00
5c22f66fb2
Merge "Pass VPN uid range to AutomaticOnOffKeepaliveTracker" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-11-16 01:30:48 +00:00
9481063d42
Merge changes from topic "multi_network_activity_tracking" into main am: 1cd89fca86 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606637

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

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-11-15 14:32:40 +00:00
608380cb78
Merge changes from topic "multi_network_activity_tracking" into main 
* changes:
  Make ConnectivityService update BatteryStats radio power state
  Track multiple network activities on V+
  Use netId as idleTimer label on V+

Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-15 13:58:37 +00:00
1cd89fca86
Pass VPN uid range to AutomaticOnOffKeepaliveTracker 
This is a preliminary change for filtering sockets that is not
in the uid ranges for automatic on/off keepalives. This commit
itself is a no-op change to pass the uid information to
AutomaticOnOffKeepaliveTracker.

Bug: 311119352
Test: atest FrameworksNetTests
Change-Id: I7d96e7a0d3f3054d1409de350420a24378b28cdb

Chiachang Wang   commited 2023-11-15 08:50:27 +00:00
59bcabe3f4
Merge "Ensure no thread leak after NetworkStatsServiceTest" into main am: c7126bb997 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815929

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2023-11-15 08:32:45 +00:00
2806c9c260
Merge "Ensure no thread leak after NetworkStatsServiceTest" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2023-11-15 07:45:34 +00:00
c7126bb997
Use FromS() on LocalNetworkConfig 
Like NetworkScore, this object is not available on R because
of the absence of the tethering module. Therefore it needs to
be wrapped to be protected against introspection by the test
libraries.

Change-Id: Ia5f84d2926433398cef33d89819a8c6588024ea0
Test: FrameworkNetTests

Chalard Jean   commited 2023-11-15 16:27:19 +09:00
b86a574fe9
Merge "Allow SysUi to see the connectivity diagnostic callbacks" into main am: 2cfffe7bfb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2807913

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

Quang Luong   authored and   Automerger Merge Worker   commited 2023-11-15 06:16:04 +00:00
d1737eceec
Ensure no thread leak after NetworkStatsServiceTest 
This change includes:
 1. A mechanism in DevSdkIngoreRunnrer to dump thread counts
    before/after tests, and compare thread counts to detect leaks.
 2. Add an annotation @MonitorThreadLeak for test classes to
    annotate the classes which should monitor thread leaks.
 3. Annotated NetworkStatsServiceTest to apply the enforcement.

Sample output:
[1/2] android.net.connectivity.com.android.server.net.NetworkStatsServiceTest#testDumpStatsMap: PASSED (1.187s)
[2/2] android.net.connectivity.com.android.server.net.NetworkStatsServiceTest#ThreadLeakMonitor: FAILED (7ms)

STACKTRACE:
java.lang.IllegalStateException: Expected threads: {binder:26055_3=1, Instr: androidx.test.runner.AndroidJUnitRunner=1, main=1, InstrumentationConnectionThread=1, binder:26055_2=1, binder:26055_1=1} but got: {binder:26055_3=1, NetworkStatsObservers=1, Instr: androidx.test.runner.AndroidJUnitRunner=1, main=1, InstrumentationConnectionThread=1, binder:26055_2=1, binder:26055_1=1}

Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest \
      --rerun-until-failure 100
Bug: 308544001
Bug: 307693729
Change-Id: Ia0bccb82c5985df608b8402009b32626b6b17c5a

Junyu Lai   commited 2023-11-15 14:03:45 +08:00
17f589cf47
Merge "Allow SysUi to see the connectivity diagnostic callbacks" into main
Quang Luong   authored and   Gerrit Code Review   commited 2023-11-15 05:51:28 +00:00
2cfffe7bfb
Check service ttl expiration am: 596a500607 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2440004

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-11-15 02:58:41 +00:00
e35b9cf2f6