diff options
| author | Junda Liu <junda@google.com> | 2015-06-17 10:15:34 -0700 |
|---|---|---|
| committer | Junda Liu <junda@google.com> | 2015-06-17 14:10:13 -0700 |
| commit | 80753bc275ba82a08671325771f96306848d41c3 (patch) | |
| tree | 71c9a517c0494089aa3a474c966919d9c8f8d220 /src/com/android/settings/SecuritySettings.java | |
| parent | 9f2b5a74420988824dd3a91abcdb85bea6fc48fa (diff) | |
| download | packages_apps_Settings-80753bc275ba82a08671325771f96306848d41c3.zip packages_apps_Settings-80753bc275ba82a08671325771f96306848d41c3.tar.gz packages_apps_Settings-80753bc275ba82a08671325771f96306848d41c3.tar.bz2 | |
Don't show SIM lock Setting if carrier config hides it.
Bug: b/19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index c967659..b41d70f 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -30,6 +30,7 @@ import android.content.res.Resources; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; +import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; import android.preference.ListPreference; @@ -43,6 +44,7 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.security.KeyStore; import android.service.trust.TrustAgentService; +import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -263,7 +265,11 @@ public class SecuritySettings extends SettingsPreferenceFragment // Do not display SIM lock for devices without an Icc card TelephonyManager tm = TelephonyManager.getDefault(); - if (!mIsPrimary || !isSimIccReady()) { + CarrierConfigManager cfgMgr = (CarrierConfigManager) + getActivity().getSystemService(Context.CARRIER_CONFIG_SERVICE); + PersistableBundle b = cfgMgr.getConfig(); + if (!mIsPrimary || !isSimIccReady() || + b.getBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) { root.removePreference(root.findPreference(KEY_SIM_LOCK)); } else { // Disable SIM lock if there is no ready SIM card. |