Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wink Saville
2013-07-02 18:17:00 +00:00
committed by Android (Google) Code Review
parent 697184b56f 68e6c6452c
commit 753d754c7d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/ConnectivityService.java
View File

@@ -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);