diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index a315e6d3993535f867854eb9a298eec8d5c40b51..dfd51ab8f67ad25b92af51a16a8fa167d5149cfd 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -820,13 +820,6 @@ 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 retry configuration for different types of APN. * @hide @@ -3455,7 +3448,6 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY, null); 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.putStringArray(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS, new String[]{ "default:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000," + "320000:5000,640000:5000,1280000:5000,1800000:5000",