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

Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad am: f92b7d2eb8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793

Change-Id: I1c561a9e9354379e4058854f8267f83f6a8980df
This commit is contained in:
Cody Kesting
2021-06-14 19:46:57 +00:00
committed by Automerger Merge Worker
parent 5179e12560 f92b7d2eb8
commit e92ac168d0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/NetworkCapabilities.java
View File

@@ -826,6 +826,7 @@ public final class NetworkCapabilities implements Parcelable {
final int originalOwnerUid = getOwnerUid(); final int originalOwnerUid = getOwnerUid();
final int[] originalAdministratorUids = getAdministratorUids(); final int[] originalAdministratorUids = getAdministratorUids();
final TransportInfo originalTransportInfo = getTransportInfo(); final TransportInfo originalTransportInfo = getTransportInfo();
final Set<Integer> originalSubIds = getSubscriptionIds();
clearAll(); clearAll();
if (0 != (originalCapabilities & NET_CAPABILITY_NOT_RESTRICTED)) { if (0 != (originalCapabilities & NET_CAPABILITY_NOT_RESTRICTED)) {
// If the test network is not restricted, then it is only allowed to declare some // If the test network is not restricted, then it is only allowed to declare some
@@ -834,6 +835,9 @@ public final class NetworkCapabilities implements Parcelable {
mTransportTypes = mTransportTypes =
(originalTransportTypes & UNRESTRICTED_TEST_NETWORKS_ALLOWED_TRANSPORTS) (originalTransportTypes & UNRESTRICTED_TEST_NETWORKS_ALLOWED_TRANSPORTS)
| (1 << TRANSPORT_TEST); | (1 << TRANSPORT_TEST);
// SubIds are only allowed for Test Networks that only declare TRANSPORT_TEST.
setSubscriptionIds(originalSubIds);
} else { } else {
// If the test transport is restricted, then it may declare any transport. // If the test transport is restricted, then it may declare any transport.
mTransportTypes = (originalTransportTypes | (1 << TRANSPORT_TEST)); mTransportTypes = (originalTransportTypes | (1 << TRANSPORT_TEST));