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

Commit 8ab77595 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 am: a12d3831 

am: 21e0927b

* commit '21e0927b':
  Add a null check before reference networkInfo.
parents 2260a618 21e0927b

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

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

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

        for (NetworkState state : states) {

            if (state.networkInfo.isConnected()) {

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

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



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

            return policy.metered;

        } else {

            if (state.networkInfo == null) {

                return false;

            }



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

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

                return true;