Allow SIM PIN on CDMA LTE devices

Bug: 5161360
Change-Id: I6f98da08e6be08403d9b3b08b02b02b9a63b14fe

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 9a83311..3813ecd 100644 (file)
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -37,6 +37,7 @@ import android.security.KeyStore;
 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 @@ public class SecuritySettings extends SettingsPreferenceFragment
         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));
         }