From de939fe559ebf45f16d23ce92867d7b805736297 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 11 Oct 2016 11:57:56 -0700
Subject: 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: Iab279d1a0b2ea26ef63b09cb9922fe1631e2dfae
---
 assets/carrier_config_44000.xml | 1 +
 assets/carrier_config_44010.xml | 1 +
 assets/carrier_config_44020.xml | 1 +
 assets/carrier_config_44100.xml | 1 +
 assets/carrier_config_44120.xml | 1 +
 5 files changed, 5 insertions(+)

diff --git a/assets/carrier_config_44000.xml b/assets/carrier_config_44000.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44000.xml
+++ b/assets/carrier_config_44000.xml
@@ -10,5 +10,6 @@
 <boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
 <boolean name="carrier_volte_available_bool" value="true" />
 <int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml
index cb4ae1c..8a78531 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -7,5 +7,6 @@
 <int name="volte_replacement_rat_int" value="3" />
 <boolean name="hide_ims_apn_bool" value="true" />
 <boolean name="always_show_emergency_alert_onoff_bool" value="true" />
+<long name="message_expiration_time_long" value="3600000" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 7b128e3..4dfcf27 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -17,5 +17,6 @@
     <item value="0xAFEE:type=tsunami, emergency=true" />
     <item value="0xAC00-0xAFED:type=other, emergency=true" />
 </string-array>
+<long name="message_expiration_time_long" value="3600000" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44100.xml b/assets/carrier_config_44100.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44100.xml
+++ b/assets/carrier_config_44100.xml
@@ -10,5 +10,6 @@
 <boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
 <boolean name="carrier_volte_available_bool" value="true" />
 <int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44120.xml b/assets/carrier_config_44120.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44120.xml
+++ b/assets/carrier_config_44120.xml
@@ -10,5 +10,6 @@
 <boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
 <boolean name="carrier_volte_available_bool" value="true" />
 <int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
 </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3