commit 6668bcdc88226c2f36f5ba4084661477e0e517c4
author Robert Greenwalt <rgreenwalt@google.com> Mon Nov 18 10:33:46 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 18 10:33:46 2013 -0800
tree f9995dab0c1193f9c2557cbe3b27ffadb4ec3dcc
parent 989bbbdddc450a8e380b5f5318bb6e38a89637ae
parent cf8c894ef3330739da845c8f032ab3349ace68cb

am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index baff661..d42ae3a 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1567,9 +1567,12 @@
             return false;
         }
         NetworkStateTracker tracker = mNetTrackers[networkType];
-        DetailedState netState = tracker.getNetworkInfo().getDetailedState();
+        DetailedState netState = DetailedState.DISCONNECTED;
+        if (tracker != null) {
+            netState = tracker.getNetworkInfo().getDetailedState();
+        }
 
-        if (tracker == null || (netState != DetailedState.CONNECTED &&
+        if ((netState != DetailedState.CONNECTED &&
                 netState != DetailedState.CAPTIVE_PORTAL_CHECK) ||
                 tracker.isTeardownRequested()) {
             if (VDBG) {