commit 61efbf7f38292980ec5a2211d8341c1dfb07dfcc
author Robert Greenwalt <rgreenwalt@google.com> Wed Nov 13 16:29:12 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 13 16:29:12 2013 -0800
tree 003a3971fbfff8b400c4d6e11f26bb344186199a
parent 788baf6d24b7cbd450ecd40fb416a2ce7a646a52
parent f3df16221a7e5970dd2ece9220b2346622533864

am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev

* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting

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 478f8c7..1574667 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) {