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

Commit 955b575d authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" 

* commit '6eddb39c':
  Fix NPE in ConnectivityService
parents d24bf4ab 6eddb39c

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

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