commit 5c68e12493d3c81324179c7c3ba6cd58279d648b
author Amith Yamasani <yamasani@google.com> Wed May 23 15:42:46 2012 -0700
committer Amith Yamasani <yamasani@google.com> Wed May 23 17:20:01 2012 -0700
tree d471f85e3361c5e34b56448bda37e7c18e38897e
parent be4a032581ae6dfb41662486085e64052d085314

Don't show SIM LOCK settings if there's no Icc card.

Bug: 6525359

Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 88a2d33..8196d0b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -201,10 +201,9 @@
         // Append the rest of the settings
         addPreferencesFromResource(R.xml.security_settings_misc);
 
-        // Do not display SIM lock for CDMA phone
+        // Do not display SIM lock for devices without an Icc card
         TelephonyManager tm = TelephonyManager.getDefault();
-        if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
-                (tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
+        if (!tm.hasIccCard()) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         } else {
             // Disable SIM lock if sim card is missing or unknown