diff options
| author | Jack Yu <jackyu@google.com> | 2015-09-16 21:02:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 21:02:48 +0000 |
| commit | 717e39df1c43806f3aa373f52c14f8b282f325b4 (patch) | |
| tree | 75d2c7afa72d875652da70499e088e888ad8e347 /telephony | |
| parent | ee16be69f1c3b3a9d6cdcb8bde70be3f7a0dbb65 (diff) | |
| parent | 870a9e6a783c7755b059d8533ae0232873bff9ba (diff) | |
| download | frameworks_base-717e39df1c43806f3aa373f52c14f8b282f325b4.zip frameworks_base-717e39df1c43806f3aa373f52c14f8b282f325b4.tar.gz frameworks_base-717e39df1c43806f3aa373f52c14f8b282f325b4.tar.bz2 | |
am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
Added a carrier config key for emergency messages on/off option always showing.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index ef730fc..aa4da4b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -319,6 +319,14 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; + /** + * The default flag specifying whether "Turn on Notifications" option will be always shown in + * Settings->More->Emergency broadcasts menu regardless developer options is turned on or not. + * @hide + */ + public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = + "always_show_emergency_alert_onoff_bool"; + /* The following 3 fields are related to carrier visual voicemail. */ /** @@ -516,6 +524,7 @@ public class CarrierConfigManager { sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, ""); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, ""); sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false); + sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false); sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null); |