commit 18a46a26a0a6a1535da4c342a82d0bb555efd3e8
author Wink Saville <wink@google.com> Tue Jul 02 10:55:14 2013 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 02 11:57:47 2013 -0700
tree 22f95dba3fd59b1364ec40a70bc9ce00c97cab50
parent cfa556303d091867e4d403369ff4dda8d01a84f8

Fix  NPE if mobile is not supported in checkMobileProvisioning.

Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c

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