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

am 788baf6d: am 86250cc5: am 18490abd: Merge "Fix NPE in ConnectivityService"

Browse Source 
* commit '788baf6d24b7cbd450ecd40fb416a2ce7a646a52':
  Fix NPE in ConnectivityService
This commit is contained in:
Robert Greenwalt
2013-11-13 10:33:56 -08:00
committed by Android Git Automerger
parent 49fa751ec6 788baf6d24
commit 40263ab366
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) {