Keep subIds for Test NetworkCapabilities.
This CL updates NetworkCapabilities to retain configured subscription IDs for Test NetworkCapabilities. Previously, they were cleared in restrictCapabilitiesForTestNetwork(). Bug: 182291467 Bug: 189125789 Test: atest Ikev2VpnTest IpSecManagerTunnelTest Test: atest CtsVcnTestCases Change-Id: I0e1bc617910c9e8ac7b431572f276b1611acc1cb
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user