commit 59c395b9adfbed1ec8b7c767006b59b5d4ca22a2
author Robert Greenwalt <rgreenwalt@google.com> Mon May 31 06:52:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 31 06:52:41 2021 +0000
tree 431be0d45aa777927cfaa154b01bbf355fd566ef
parent 9563eb5a741973a48a1fee93de2a5c19d5e3ab26
parent f4f53e0f33b23c64d90cf4d568a5674f2003cd80

am b6344cef: am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService" am: f4f53e0f33

Original change: undetermined

Change-Id: Idc934755ca67b3f4e813e4f6b8bf8c1ce4f41e99

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 571724d..7910147 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1568,9 +1568,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) {