commit 411290aa4b290f5aadc9c678884aa65a2ebbb945
author Robert Greenwalt <rgreenwalt@google.com> Fri Nov 11 11:50:34 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 11 11:50:34 2011 -0800
tree 065ca217fbe4ca87162fdd18fcfff3b2e4873531
parent 9b5b5858e0b43ac16157d1b7dff025f69b74bcd9
parent 424781e2e1a1f1447eea733ffd1dc0f8006b628e

am 424781e2: Fix NPE in ConnectivityService.

* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  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 fc87033..6e4aca7 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1597,6 +1597,7 @@
                 if (checkType == prevNetType) continue;
                 if (mNetConfigs[checkType] == null) continue;
                 if (!mNetConfigs[checkType].isDefault()) continue;
+                if (mNetTrackers[checkType] == null) continue;
 
 // Enabling the isAvailable() optimization caused mobile to not get
 // selected if it was in the middle of error handling. Specifically