diff options
| author | Junda Liu <junda@google.com> | 2015-06-17 18:11:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 18:11:03 +0000 |
| commit | a5aabfebcaad34b9fdea222d858fc54d18e462c0 (patch) | |
| tree | eb64fb12e08b3344b48f97388eac339699836710 | |
| parent | 563d60e03f8d5961e5578fca66092bd6b8d5496e (diff) | |
| parent | e15cca771cd641d611ecf00b20621a688a383036 (diff) | |
| download | frameworks_base-a5aabfebcaad34b9fdea222d858fc54d18e462c0.zip frameworks_base-a5aabfebcaad34b9fdea222d858fc54d18e462c0.tar.gz frameworks_base-a5aabfebcaad34b9fdea222d858fc54d18e462c0.tar.bz2 | |
Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 2094c7c..3c1612d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30625,6 +30625,7 @@ package android.telephony { field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_vibration_bool"; field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool"; field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool"; + field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool"; field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool"; field public static final java.lang.String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled"; field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars"; diff --git a/api/system-current.txt b/api/system-current.txt index 9386c50..90d5ad3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32845,6 +32845,7 @@ package android.telephony { field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_vibration_bool"; field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool"; field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool"; + field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool"; field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool"; field public static final java.lang.String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled"; field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index bcfee30..3f78497 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -125,6 +125,10 @@ public class CarrierConfigManager { public static final String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool"; + /** Control whether users can reach the SIM lock settings. */ + public static final String + KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool"; + /** Control whether users can edit APNs in Settings. */ public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool"; @@ -328,6 +332,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true); sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false); sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); + sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false); sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false); sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true); sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true); |