commit 9fb7b17c465e6cf38681ef7742ee1a0a486c5b79
author Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Tue Dec 20 16:45:45 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 20 16:45:45 2011 -0800
tree 21e05b99b757953d0e598eadd00664c15836941c
parent e8b0e7d3f4432284975d2fcfd80efa5d6f9b50ea
parent a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78

am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available

* commit 'a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
  Don't enable SIM PIN Lock menu if SIM is not available

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index ab58dd5..7ca5815 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -185,6 +185,14 @@
         if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
                 (tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
+        } else {
+            // Disable SIM lock if sim card is missing or unknown
+            if ((TelephonyManager.getDefault().getSimState() ==
+                                 TelephonyManager.SIM_STATE_ABSENT) ||
+                (TelephonyManager.getDefault().getSimState() ==
+                                 TelephonyManager.SIM_STATE_UNKNOWN)) {
+                root.findPreference(KEY_SIM_LOCK).setEnabled(false);
+            }
         }
 
         // Show password