commit 4cfc0dd0d795ed29a15022e55d7b745a5064047a
author Wink Saville <wink@google.com> Fri Aug 19 13:55:17 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 19 13:55:17 2011 -0700
tree 187772073ded3cb85238b7af6de7b32ce520c99a
parent 0f3f91854c6d590d7d83fa6155684d9d63e0362b
parent cd05e8859599658a546b5d4ee09068dd2833b901

Merge "Allow SIM PIN on CDMA LTE devices"

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 9a83311..3813ecd 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -37,6 +37,7 @@
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.internal.telephony.Phone;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.ArrayList;
@@ -162,8 +163,9 @@
         addPreferencesFromResource(R.xml.security_settings_misc);
 
         // Do not display SIM lock for CDMA phone
-        if (TelephonyManager.PHONE_TYPE_CDMA ==
-                TelephonyManager.getDefault().getCurrentPhoneType()) {
+        TelephonyManager tm = TelephonyManager.getDefault();
+        if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
+                (tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         }