diff options
| author | 2016-11-04 08:22:59 +0000 | |
|---|---|---|
| committer | 2016-11-04 08:23:01 +0000 | |
| commit | e966a971138b95c79baf48362e77610926c5f65e (patch) | |
| tree | 33940e75d72ed2b09dfd3996f68f909daff276c1 | |
| parent | c447d9ef6a6932f6abdddc3aa6e59cf92792372b (diff) | |
| parent | f8247928a206e7bf31d885eeef533fc7b7c8b359 (diff) | |
Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 08477884fea9..27741c71d62d 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -443,6 +443,13 @@ public class CarrierConfigManager { "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. * @hide */ @@ -1064,6 +1071,7 @@ public class CarrierConfigManager { 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.putLong(KEY_MESSAGE_EXPIRATION_TIME_LONG, 86400000L); 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", |