From f8247928a206e7bf31d885eeef533fc7b7c8b359 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 3 Nov 2016 12:24:22 -0700 Subject: [PATCH] Added CMAS/ETWS duplicate expiration support Now message duplication detection will only look back messages for 24 hours by default for all countries, except 1 hour in Japan. Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit bug: 31171149 Change-Id: I6765c9cebdb3bd9ab6d065f10acbd66047a34d8c --- .../java/android/telephony/CarrierConfigManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 08477884fea9d..27741c71d62d2 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -442,6 +442,13 @@ public class CarrierConfigManager { public static final String KEY_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. * @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",