From 2e66ad5901c436192937e95a8bb6b2fa07585578 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 24 Oct 2019 00:34:26 -0700 Subject: [PATCH] Migrated message duplicate detection to cell broadcast service The duplicate detection logic is now moved to the new cell broadcast service so all clients can benefit from this. Also added multi-sim duplicate detection check because now cell broadcast messages are enabled on all subs. Test: Manual Bug: 143177972 Merged-In: I6bbe8e938846d07b1260eb83e532b7f46aeabeaf Change-Id: I6bbe8e938846d07b1260eb83e532b7f46aeabeaf (cherry picked from commit ffc2c116047e4e76d063f838fe3d7fa1e689094c) --- .../java/android/telephony/CarrierConfigManager.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f34c7a8543ab3..4dad01f9d5c0e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -827,13 +827,6 @@ 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 @@ -3387,7 +3380,6 @@ 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",