commit ef5c31ae3eced8b5def6881c86d962fa07d43fb0
author Wink Saville <wink@google.com> Tue Jul 02 12:36:47 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 02 12:36:47 2013 -0700
tree 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981
parent 68513498e77fc03b5dfa2071b022de7d2273fe70
parent fdb84863b30852dc7f60126b9427a595d2ffbd0d

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

* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
  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 9e9253a..e7dd3b7 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3553,6 +3553,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);