commit b0a3f089425237565f95602cf4ba4843ba80b66e
author Wink Saville <wink@google.com> Tue Jul 02 12:41:31 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 02 12:41:31 2013 -0700
tree e330e687ec5fa3884bdcb19ba87af33e4b5548cd
parent 0cc0a44c2fac2fa033dbcd76443c79eb2a0b4f76
parent 6152916c450942c6eeae8270eb2aed9a16639295

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

* commit '6152916c450942c6eeae8270eb2aed9a16639295':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index fc346a2..f2e0f29 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3564,6 +3564,16 @@
             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);