LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow tests to create TRANSPORT_TEST|TRANSPORT_VPN networks.

Browse Source 
This CL allows an app that has the MANAGE_TEST_NETWORKS
permission to create test VPN networks.

The code enforces that such networks can never apply to any UIDs
and thus will never carry any traffic.

Bug: 173331190
Test: passes existing tests, moved tests pass
Change-Id: I5befea0e3b4b6dce4ca0c6a04471a055186b644c
This commit is contained in:
Lorenzo Colitti
2020-11-26 18:05:13 +09:00
parent 129c01eabf
commit f3963fa279
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/NetworkCapabilities.java
View File

@@ -712,6 +712,7 @@ public final class NetworkCapabilities implements Parcelable {
if (ArrayUtils.contains(originalAdministratorUids, creatorUid)) { if (ArrayUtils.contains(originalAdministratorUids, creatorUid)) {
setAdministratorUids(new int[] {creatorUid}); setAdministratorUids(new int[] {creatorUid});
} }
// There is no need to clear the UIDs, they have already been cleared by clearAll() above.
} }
/** /**
@@ -805,7 +806,9 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
private static final int TEST_NETWORKS_ALLOWED_TRANSPORTS = 1 << TRANSPORT_TEST private static final int TEST_NETWORKS_ALLOWED_TRANSPORTS = 1 << TRANSPORT_TEST
// Test ethernet networks can be created with EthernetManager#setIncludeTestInterfaces // Test ethernet networks can be created with EthernetManager#setIncludeTestInterfaces
| 1 << TRANSPORT_ETHERNET; | 1 << TRANSPORT_ETHERNET
// Test VPN networks can be created but their UID ranges must be empty.
| 1 << TRANSPORT_VPN;
/** /**
* Adds the given transport type to this {@code NetworkCapability} instance. * Adds the given transport type to this {@code NetworkCapability} instance.