PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2012-05-25 10:14:58 -07:00
committed by Android (Google) Code Review
parent 60111cf073 5c68e12493
commit a5ac7ce514
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SecuritySettings.java
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