commit f3d0e69b618ec09ca7002b40f45eb88e5ced4b06
author Baligh Uddin <baligh@google.com> Wed Jun 04 04:33:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 04 04:33:06 2014 +0000
tree 6ad6bb34ef452b07d6ee8064e3539f7661e5e381
parent 56a19567e717cc6e4f9bbbe1b71b3e130b03ea27
parent 3dfdbde6b573a61696ab1d9834c680839c51846a

Merge "Import translations. DO NOT MERGE"

src/com/android/phone/NetworkSetting.java

diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 874be30..4bd02cf 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -74,6 +74,7 @@
     protected boolean mIsForeground = false;
 
     private UserManager mUm;
+    private boolean mUnavailable;
 
     /** message for network selection */
     String mNetworkSelectMsg;
@@ -231,6 +232,7 @@
 
         if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
             setContentView(R.layout.telephony_disallowed_preference_screen);
+            mUnavailable = true;
             return;
         }
 
@@ -272,9 +274,10 @@
      */
     @Override
     protected void onDestroy() {
-        // unbind the service.
-        unbindService(mNetworkQueryServiceConnection);
-
+        if (!mUnavailable) {
+            // unbind the service.
+            unbindService(mNetworkQueryServiceConnection);
+        }
         super.onDestroy();
     }