Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ac7ce5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 60111cf0 5c68e124

src/com/android/settings/SecuritySettings.java

+2 −3
Original line number Diff line number Diff line
@@ -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