From b8eaf45e1df007fc4f5a11bb58491abaef39cd57 Mon Sep 17 00:00:00 2001
From: Wei Liu <luciferleo@google.com>
Date: Mon, 25 Jan 2016 10:32:27 -0800
Subject: [PATCH] Add a null check before reference networkInfo.

b/26758858

Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
---
 .../com/android/server/net/NetworkPolicyManagerService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 1b08c2fcb6504..cb3bcb087b547 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -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;