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

Merge \"Made severe and extreme alert configuration dependency configurable\" into nyc-mr1-dev

Browse Source 
am: 338566df68

Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e
This commit is contained in:
Jack Yu
2016-07-20 01:06:25 +00:00
committed by android-build-merger
parent cdff2be19c 338566df68
commit c26d7f3624
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
@@ -945,6 +952,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");