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

Commit db011499 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 753d754c: Merge "Fix NPE if mobile is not supported in... 

am 753d754c: Merge "Fix  NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev

* commit '753d754c':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
parents 24a12f67 753d754c

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

+10 −0
Original line number Diff line number Diff line
@@ -3553,6 +3553,16 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            timeOutMs = CheckMp.MAX_TIMEOUT_MS;

        }



        // Check that mobile networks are supported

        if (!isNetworkSupported(ConnectivityManager.TYPE_MOBILE)

                || !isNetworkSupported(ConnectivityManager.TYPE_MOBILE_HIPRI)) {

            log("checkMobileProvisioning: X no mobile network");

            if (resultReceiver != null) {

                resultReceiver.send(ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION, null);

            }

            return timeOutMs;

        }



        final long token = Binder.clearCallingIdentity();

        try {

            CheckMp checkMp = new CheckMp(mContext, this);