diff options
| author | 2015-09-16 21:19:50 +0000 | |
|---|---|---|
| committer | 2015-09-16 21:19:50 +0000 | |
| commit | d51b6bc260c3ff8210c483b34d03df0e451ebdf0 (patch) | |
| tree | 1528d2824cb4a6023f60f8b51a01e3984292d398 | |
| parent | 9bf4d76579152fce4c045c78347a164d1b7305cd (diff) | |
| parent | 08607194cfbbb64c24900cc14afb2eeb44cacd20 (diff) | |
am 08607194: am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
* commit '08607194cfbbb64c24900cc14afb2eeb44cacd20':
Added a carrier config key for emergency messages on/off option always showing.
| -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 ef730fc3eee2..aa4da4b1b690 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); |