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

Merge changes I6d5dd0a8,I106b3e4f

Browse Source 
* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager
This commit is contained in:
Lucas Lin
2021-03-25 10:49:35 +00:00
committed by Gerrit Code Review
parent c4c056b647 c3f7c8fd3c
commit 276f8e6a70
2 changed files with 8 additions and 8 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.getMode(),
c.getSourceAddress(), c.getSourceAddress(),
c.getDestinationAddress(), c.getDestinationAddress(),
(c.getNetwork() != null) ? c.getNetwork().netId : 0, (c.getNetwork() != null) ? c.getNetwork().getNetId() : 0,
spiRecord.getSpi(), spiRecord.getSpi(),
c.getMarkValue(), c.getMarkValue(),
c.getMarkMask(), c.getMarkMask(),

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

@@ -174,7 +174,6 @@ import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.IConnectivityManager;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.INetworkPolicyListener; import android.net.INetworkPolicyListener;
import android.net.INetworkPolicyManager; import android.net.INetworkPolicyManager;
@@ -1219,10 +1218,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private static boolean updateCapabilityChange(SparseBooleanArray lastValues, boolean newValue, private static boolean updateCapabilityChange(SparseBooleanArray lastValues, boolean newValue,
Network network) { Network network) {
final boolean lastValue = lastValues.get(network.netId, false); final boolean lastValue = lastValues.get(network.getNetId(), false);
final boolean changed = (lastValue != newValue) || lastValues.indexOfKey(network.netId) < 0; final boolean changed = (lastValue != newValue)
|| lastValues.indexOfKey(network.getNetId()) < 0;
if (changed) { if (changed) {
lastValues.put(network.netId, newValue); lastValues.put(network.getNetId(), newValue);
} }
return changed; return changed;
} }
@@ -1245,7 +1245,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mNetworkRoaming, newRoaming, network); mNetworkRoaming, newRoaming, network);
if (meteredChanged || roamingChanged) { if (meteredChanged || roamingChanged) {
mLogger.meterednessChanged(network.netId, newMetered); mLogger.meterednessChanged(network.getNetId(), newMetered);
updateNetworkRulesNL(); updateNetworkRulesNL();
} }
} }
@@ -2002,7 +2002,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mNetIdToSubId.clear(); mNetIdToSubId.clear();
final ArrayMap<NetworkStateSnapshot, NetworkIdentity> identified = new ArrayMap<>(); final ArrayMap<NetworkStateSnapshot, NetworkIdentity> identified = new ArrayMap<>();
for (final NetworkStateSnapshot snapshot : snapshots) { 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 // 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 // in the object created here is never used and its value doesn't matter, so use
@@ -5772,7 +5772,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@GuardedBy("mNetworkPoliciesSecondLock") @GuardedBy("mNetworkPoliciesSecondLock")
private int getSubIdLocked(Network network) { private int getSubIdLocked(Network network) {
return mNetIdToSubId.get(network.netId, INVALID_SUBSCRIPTION_ID); return mNetIdToSubId.get(network.getNetId(), INVALID_SUBSCRIPTION_ID);
} }
@GuardedBy("mNetworkPoliciesSecondLock") @GuardedBy("mNetworkPoliciesSecondLock")