From 6642bda24390a24a3c604d731bf865f8661a4a2f Mon Sep 17 00:00:00 2001 From: lucaslin Date: Fri, 19 Mar 2021 15:18:47 +0800 Subject: [PATCH 1/2] Remove unused import IConnectivityManager Bug: 182963397 Test: m Change-Id: I106b3e4f68b4e5610a238931aa3e81afdd927422 Merged-In: I106b3e4f68b4e5610a238931aa3e81afdd927422 (cherry-picked from ag/13921812) --- .../java/com/android/server/net/NetworkPolicyManagerService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 46c80e7c44e3e..602878c0deff8 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -174,7 +174,6 @@ import android.content.res.Resources; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; -import android.net.IConnectivityManager; import android.net.INetworkManagementEventObserver; import android.net.INetworkPolicyListener; import android.net.INetworkPolicyManager; From c3f7c8fd3c28326b5a0b073f68346f3529eff71f Mon Sep 17 00:00:00 2001 From: lucaslin Date: Fri, 19 Mar 2021 16:06:33 +0800 Subject: [PATCH 2/2] Use public API Network#getNetId() to get netid Network class will be a part of mainline module, external callers cannot call its hidden constant. Use public API - getNetId() to get netid instead. Bug: 182963397 Test: m Change-Id: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40 Merged-In: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40 (cherry-picked from ag/13927649) --- .../core/java/com/android/server/IpSecService.java | 2 +- .../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 4c3c6ef21fc57..794cb9301d696 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 602878c0deff8..0b348ed618ac8 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -1219,10 +1219,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; } @@ -1245,7 +1246,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mNetworkRoaming, newRoaming, network); if (meteredChanged || roamingChanged) { - mLogger.meterednessChanged(network.netId, newMetered); + mLogger.meterednessChanged(network.getNetId(), newMetered); updateNetworkRulesNL(); } } @@ -2011,7 +2012,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mNetIdToSubId.clear(); final ArrayMap 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 @@ -5781,7 +5782,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")