From 37302074650054778f890453f628caa30e7f2f5d Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Tue, 2 Jul 2013 12:41:31 -0700
Subject: [PATCH] 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.
---
 .../java/com/android/server/ConnectivityService.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

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