am f007430e: am a5ac7ce5: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev

* commit 'f007430ed5aa1e1218caae9de6dded511c5d761f':
  Don't show SIM LOCK settings if there's no Icc card.
This commit is contained in:
Amith Yamasani
2012-05-25 10:21:56 -07:00
committed by Android Git Automerger

View File

@@ -201,10 +201,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
// 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