Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70

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

Change-Id: Ife29dba8549f9b86cfe757a59fd4c8e61e55738f
This commit is contained in:
Lucas Lin
2021-03-25 11:46:03 +00:00
committed by Automerger Merge Worker
parent 307a73be5b 276f8e6a70
commit db4eb02ecd
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/IpSecService.java
View File

@@ -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(),

13
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -1218,10 +1218,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;
}
@@ -1244,7 +1245,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mNetworkRoaming, newRoaming, network);
if (meteredChanged || roamingChanged) {
mLogger.meterednessChanged(network.netId, newMetered);
mLogger.meterednessChanged(network.getNetId(), newMetered);
updateNetworkRulesNL();
}
}
@@ -2001,7 +2002,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
@@ -5771,7 +5772,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")