joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
* commit '48eded0e8f':
  Fix NPE in ConnectivityService
This commit is contained in:
Robert Greenwalt 2013-11-13 10:27:46 -08:00 • committed by Android Git Automerger
commit b6344cefc4
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

@ -1567,9 +1567,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return false; return false;
} }
NetworkStateTracker tracker = mNetTrackers[networkType]; 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) || netState != DetailedState.CAPTIVE_PORTAL_CHECK) ||
tracker.isTeardownRequested()) { tracker.isTeardownRequested()) {
if (VDBG) { if (VDBG) {