am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev am: b72702da1f
Original change: undetermined Change-Id: I1da8d500af399d7d947768c2f80ce96bd62de230
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user