diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-25 10:21:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 10:21:56 -0700 |
| commit | 0ab861f05481dbb0d3764aa429dd2da50e25fa82 (patch) | |
| tree | a006acf5d4a2f0ecaa639d2d8928753bef8a56e3 | |
| parent | 484aeb5fd78bbec0169bda8a4cd0cacbd3caaaae (diff) | |
| parent | f007430ed5aa1e1218caae9de6dded511c5d761f (diff) | |
| download | packages_apps_Settings-0ab861f05481dbb0d3764aa429dd2da50e25fa82.zip packages_apps_Settings-0ab861f05481dbb0d3764aa429dd2da50e25fa82.tar.gz packages_apps_Settings-0ab861f05481dbb0d3764aa429dd2da50e25fa82.tar.bz2 | |
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.
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ 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 |