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

Commit a12d3831 authored by Wei Liu's avatar Wei Liu Committed by android-build-merger
Browse files

Add a null check before reference networkInfo. am: b8eaf45e 

am: dca8f100

* commit 'dca8f100':
  Add a null check before reference networkInfo.
parents e8b476e8 dca8f100

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1206,7 +1206,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        final ArrayList<Pair<String, NetworkIdentity>> connIdents = new ArrayList<>(states.length);

        final ArrayList<Pair<String, NetworkIdentity>> connIdents = new ArrayList<>(states.length);

        final ArraySet<String> connIfaces = new ArraySet<String>(states.length);

        final ArraySet<String> connIfaces = new ArraySet<String>(states.length);

        for (NetworkState state : states) {

        for (NetworkState state : states) {

            if (state.networkInfo.isConnected()) {

            if (state.networkInfo != null && state.networkInfo.isConnected()) {

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);





                final String baseIface = state.linkProperties.getInterfaceName();

                final String baseIface = state.linkProperties.getInterfaceName();
@@ -1970,6 +1970,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        if (policy != null) {

        if (policy != null) {

            return policy.metered;

            return policy.metered;

        } else {

        } else {

            if (state.networkInfo == null) {

                return false;

            }



            final int type = state.networkInfo.getType();

            final int type = state.networkInfo.getType();

            if (isNetworkTypeMobile(type) || type == TYPE_WIMAX) {

            if (isNetworkTypeMobile(type) || type == TYPE_WIMAX) {

                return true;

                return true;