LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
This commit is contained in:
Wink Saville
2013-07-02 12:36:47 -07:00
committed by Android Git Automerger
parent 3463b3ff48 d469c47d5b
commit 6152916c45
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; 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(); final long token = Binder.clearCallingIdentity();
try { try {
CheckMp checkMp = new CheckMp(mContext, this); CheckMp checkMp = new CheckMp(mContext, this);