Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 276f8e6a authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge changes I6d5dd0a8,I106b3e4f 

* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager
parents c4c056b6 c3f7c8fd

services/core/java/com/android/server/IpSecService.java

+1 −1
Original line number Diff line number Diff line
@@ -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(),

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+7 −7
Original line number Diff line number Diff line
@@ -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;
@@ -1219,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;

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

                }

            }
@@ -2002,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
@@ -5772,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")