Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "move carrierconfig key disable_severe_when_extreme_disabled to res"

Browse Source 
am: 7be5365dc6

Change-Id: I5d01026c76c48658a1b02850becdf17dc11a6312
This commit is contained in:
Chen Xu
2019-12-19 14:48:08 -08:00
committed by android-build-merger
parent 52432f5737 7be5365dc6
commit e288ec2d24
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -853,13 +853,6 @@ public class CarrierConfigManager {
public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL =
"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. * The data call retry configuration for different types of APN.
* @hide * @hide
@@ -3492,7 +3485,6 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY, null); sDefaults.putStringArray(KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false); sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_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[]{ sDefaults.putStringArray(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS, new String[]{
"default:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000," "default:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"
+ "320000:5000,640000:5000,1280000:5000,1800000:5000", + "320000:5000,640000:5000,1280000:5000,1800000:5000",