move carrierconfig key disable_severe_when_extreme_disabled to res

Bug: 135956699
Test: Manual
Change-Id: Ib12ff430c5781044ec0b36ac9b930224fc410c95
(cherry picked from commit 49b3b1680d)
Merged-in: Ib12ff430c5781044ec0b36ac9b930224fc410c95
This commit is contained in:
Chen Xu
2019-11-18 17:47:03 -08:00
parent c5480019ce
commit aec1aa8d5d

View File

@@ -832,13 +832,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
@@ -3471,7 +3464,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",