Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
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
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
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
Allow SysUi to see the connectivity diagnostic callbacks
SysUi needs to see connectivity diagnostic callbacks to display
 "Checking for internet access..." -> "Connected" or "No internet access".

Bug: 307161342
Test: atest FrameworksNetTests, manually connect to a network without internet connectivity,
verify Internet Dialog doesn't get stuck showing
 "Checking for internet access..."

Change-Id: I86e2b852ff9e5dfbfc37ba711f477166b0ac6835

Quang Anh Luong   commited 2023-11-15 11:06:42 +09:00
28eefef05d
Check service ttl expiration
Now, every services are cached on MdnsServiceCache, so the
remaining TTL should be checked when retrieving services from
the MdnsServiceCache and have a callback to notify the
MdnsServiceTypeClient about expired services.

Bug: 265787401
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I99da6cc79bdf5df3c899e642e067907501bc9d4f

Paul Hu   commited 2023-11-14 09:13:42 +00:00
596a500607
Make ConnectivityService update BatteryStats radio power state
Currently, BatteryStatsService register netd callback and track radio
power state only for the default network.
So, battery stats are not accurate if cellular and Wi-Fi networks are
active at the same time.

aosp/2561090 updates BatteryStatsService not to register netd callback
on V+ devices.
This CL updates LegacyNetworkActivityTracker to call BatteryStats API
and update radio power state for networks including non default networks
on V+ devices.

Bug: 267870186
Bug: 279380356
Test: atest FrameworksNetTests
Change-Id: I826b3b4046cc7b8aef46c13300854eaf14b1b777

Motomu Utsumi   commited 2023-11-14 15:50:42 +09:00
db537accdc
Track multiple network activities on V+
on V+ devices, NetworkActivityTracker adds idleTimer when the network is
first connected and removes idleTimer when the network is disconnected
so that activity tracker can receive netd
onInterfaceClassActivityChanged callback for multiple networks.

Bug: 267870186
Bug: 279380356
Test: atest FrameworksNetTests
Change-Id: I6f3a95c27e3e58f3f60c40065f562d00431a56b1

Motomu Utsumi   commited 2023-11-14 15:50:36 +09:00
1f5ffa4273
Use netId as idleTimer label on V+
Following CL adds idleTimer for multiple networks and track activities
including non default network on V+
Current LegacyNetworkActivityTracker uses transport type as an idleTimer
label but this makes it difficult to have multiple idleTimers.
So, this CL updates LegacyNetworkActivityTracker to support using netId
as an idleTimer label.

Bug: 267870186
Bug: 279380356
Test: atest FrameworksNetTests
Change-Id: I0039f5624ae1d142dbacba53aa90ca9bf6d43599

Motomu Utsumi   commited 2023-11-14 13:43:45 +09:00
5fce43e548
Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main am: 8b61783b78
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2797273

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

Hansen Kurli   authored and   Automerger Merge Worker   commited 2023-11-13 06:03:19 +00:00
007b29987f
Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main
* changes:
  Expect no error for startLegacyVpn with IPv6.
  Remove tests related to LegacyVpnRunner.

Hansen Kurli   authored and   Gerrit Code Review   commited 2023-11-13 05:27:07 +00:00
8b61783b78
Merge "Add NSD_LIMIT_LABEL_COUNT flag" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-11-09 14:09:29 +00:00
a96c86d34a
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main am: 7cf6e5a3b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2793352

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-09 02:37:35 +00:00
ee97d31f68
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-09 02:08:36 +00:00
7cf6e5a3b0
Merge "New firewall chain for default background restrictions" into main am: 6bca8c1df8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2818818

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

Suprabh Shukla   authored and   Automerger Merge Worker   commited 2023-11-08 14:29:56 +00:00
22116cc206
New firewall chain for default background restrictions
A new firewall chain is needed to configure background network
restrictions for apps.
This change only adds the API stubs and traffic controller constants to
make the chain work. Policy changes using this chain will follow in
the framework code.

Test: atest CtsNetTestCases:ConnectivityManagerTest
Test: atest ConnectivityServiceTest

NO_IFTTT=The Lint rule along with the relevant code in Common.h is
being deleted in aosp/2819759

Bug: 304347838
Change-Id: I33e2db6671431f7c576fc931d9f96e684fc1e78a

Suprabh Shukla   commited 2023-11-08 10:17:30 +00:00
2d893b68a9
Add NSD_LIMIT_LABEL_COUNT flag
Bug: 307475137
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Merged-In: I48b1dc26f41549ec4afc71f87e98a02ac773430f
Change-Id: Ic4c2e4c0d61b76b1afd556560c18171bdb7a088e

Paul Hu   commited 2023-11-08 16:25:27 +08:00
fd357ef695
Merge changes Ie1a36c3c,Id727cf7b,Ifba198d9 into main am: 87f7f27ad0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817124

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2023-11-07 19:39:59 +00:00
6d2868f1fc
Merge changes Ie1a36c3c,Id727cf7b,Ifba198d9 into main
* changes:
  Remove unnecessary check for skDestroyListener
  Remove TrafficController
  Remove native code path in BpfNetMaps.java

Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-11-07 19:32:51 +00:00
87f7f27ad0
Merge changes I301bf032,I8caca97b into main am: e28740f79b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801573

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-07 14:01:09 +00:00
04523693b2
Add test to make sure that unwanted local nets disconnect correctly
Also add some toString() methods that were useful in debugging.

Test: new test in CSLocalAgentTests
Change-Id: Ife95815e39d92bbef84b1c5ea75a151882590d09

Chalard Jean   commited 2023-11-07 22:28:25 +09:00
4fe2339f2c
Remove native code path in BpfNetMaps.java
BpfNetMaps uses java library for updating bpf map as the default code
path.
This is already released to 100% production without any issues.
So this CL removes the old code path from BpfNetMaps.

Note that native_init only opens the bpf maps if sEnableJavaBpfMap is
true.
But if sEnableJavaBpfMap is true, no native code in TrafficController
access the bpf map.
So this CL can remove native_init.

Following CL will remove the nativce codes for old code path.

Bug: 217624062
Test: NetworkStaticLibsTests
Change-Id: Ifba198d9e6f93b53fd1dbf3b2aafb644da0b147d

Motomu Utsumi   commited 2023-11-07 17:45:32 +09:00
96b6c39229