LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: undetermined

Change-Id: Idc934755ca67b3f4e813e4f6b8bf8c1ce4f41e99
This commit is contained in:
Robert Greenwalt
2021-05-31 06:52:41 +00:00
committed by Automerger Merge Worker
parent 9563eb5a74 f4f53e0f33
commit 59c395b9ad
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/ConnectivityService.java
View File

@@ -1568,9 +1568,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
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) {