diff options
| -rw-r--r-- | services/core/java/com/android/server/IpSecService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java index 4c3c6ef21fc5..794cb9301d69 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/services/core/java/com/android/server/IpSecService.java @@ -1651,7 +1651,7 @@ public class IpSecService extends IIpSecService.Stub { c.getMode(), c.getSourceAddress(), c.getDestinationAddress(), - (c.getNetwork() != null) ? c.getNetwork().netId : 0, + (c.getNetwork() != null) ? c.getNetwork().getNetId() : 0, spiRecord.getSpi(), c.getMarkValue(), c.getMarkMask(), diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 1757cbc4e696..350563f9803d 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -1216,10 +1216,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private static boolean updateCapabilityChange(SparseBooleanArray lastValues, boolean newValue, Network network) { - final boolean lastValue = lastValues.get(network.netId, false); - final boolean changed = (lastValue != newValue) || lastValues.indexOfKey(network.netId) < 0; + final boolean lastValue = lastValues.get(network.getNetId(), false); + final boolean changed = (lastValue != newValue) + || lastValues.indexOfKey(network.getNetId()) < 0; if (changed) { - lastValues.put(network.netId, newValue); + lastValues.put(network.getNetId(), newValue); } return changed; } @@ -1242,7 +1243,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mNetworkRoaming, newRoaming, network); if (meteredChanged || roamingChanged) { - mLogger.meterednessChanged(network.netId, newMetered); + mLogger.meterednessChanged(network.getNetId(), newMetered); updateNetworkRulesNL(); } } @@ -2008,7 +2009,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mNetIdToSubId.clear(); final ArrayMap<NetworkStateSnapshot, NetworkIdentity> identified = new ArrayMap<>(); for (final NetworkStateSnapshot snapshot : snapshots) { - mNetIdToSubId.put(snapshot.network.netId, parseSubId(snapshot)); + mNetIdToSubId.put(snapshot.network.getNetId(), parseSubId(snapshot)); // Policies matched by NPMS only match by subscriber ID or by ssid. Thus subtype // in the object created here is never used and its value doesn't matter, so use @@ -5777,7 +5778,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @GuardedBy("mNetworkPoliciesSecondLock") private int getSubIdLocked(Network network) { - return mNetIdToSubId.get(network.netId, INVALID_SUBSCRIPTION_ID); + return mNetIdToSubId.get(network.getNetId(), INVALID_SUBSCRIPTION_ID); } @GuardedBy("mNetworkPoliciesSecondLock") |