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

Merge "Keep subIds for Test NetworkCapabilities."

Browse source
This commit is contained in:
Cody Kesting 2021-06-14 19:22:00 +00:00 • committed by Gerrit Code Review
commit 35839b48ad
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

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