Add a null check before reference networkInfo. (b8eaf45e) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	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 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();
		@@ -1970,6 +1970,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;