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

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

am c880ae16: am db011499: am 753d754c: Merge "Fix NPE if mobile is not... 

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

* commit 'c880ae16':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
parents 53c8979f c880ae16

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

+10 −0
Original line number Diff line number Diff line
@@ -3564,6 +3564,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);