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. am: 4b4fcc7a72 am: 04c831319e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511312

Change-Id: Ib262f33cf2f467bf6610e2910d96fbcacb733a54
This commit is contained in:
Lorenzo Colitti
2020-11-28 04:09:11 +00:00
committed by Automerger Merge Worker
parent ed3589c104 04c831319e
commit bb06c82637
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)) {
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
// 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.