Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eddb39c authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 18490abd: Merge "Fix NPE in ConnectivityService" 

* commit '18490abd':
  Fix NPE in ConnectivityService
parents 22108007 18490abd

services/java/com/android/server/ConnectivityService.java

+5 −2
Original line number Diff line number Diff line
@@ -1439,9 +1439,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) {