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

Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-04 08:22:59 +00:00
committed by Android (Google) Code Review
parent c447d9ef6a f8247928a2
commit e966a97113
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

@@ -442,6 +442,13 @@ public class CarrierConfigManager {
public static final String KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL = public static final String KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL =
"disable_severe_when_extreme_disabled_bool"; "disable_severe_when_extreme_disabled_bool";
/**
* The message expiration time in milliseconds for duplicate detection purposes.
* @hide
*/
public static final String KEY_MESSAGE_EXPIRATION_TIME_LONG =
"message_expiration_time_long";
/** /**
* The data call retry configuration for different types of APN. * The data call retry configuration for different types of APN.
* @hide * @hide
@@ -1064,6 +1071,7 @@ public class CarrierConfigManager {
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.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);
sDefaults.putLong(KEY_MESSAGE_EXPIRATION_TIME_LONG, 86400000L);
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",