From e79419847ca52c1be4205912fb2dd88314128f30 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 19 Jul 2016 15:20:06 -0700 Subject: [PATCH] Made severe and extreme alert configuration dependency configurable Before when extreme alert is disabled, severe alert will be disabled by default because we assume users won't be interested in severe alert if he is even not interested in extreme (higher level) alert. Now carriers are allowed to turn this feature off by carrier config. bug: 29369591 Change-Id: I3eb8a0c3e2df420ea75a77ec01cc447013434219 --- .../java/android/telephony/CarrierConfigManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 2a95d3ec07cd9..3c8f5faf6f89e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -402,6 +402,13 @@ public class CarrierConfigManager { public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool"; + /** + * The flag to disable cell broadcast severe alert when extreme alert is disabled. + * @hide + */ + public static final String KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL = + "disable_severe_when_extreme_disabled_bool"; + /** * The data call APN retry configuration for default type APN. * @hide @@ -924,6 +931,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true); sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false); sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false); + sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true); sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING, "default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000," + "320000:5000,640000:5000,1280000:5000,1800000:5000");