From 8f74982db8abb5c3e6e548a9cec0f2424bc129de Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Mon, 10 Jul 2017 14:43:12 -0700
Subject: Added extra message enabled check when receiving alerts

Though we are not supposed to receive messages that are
not enabled, it is still safer to add extra enablement check
when receiving the alerts.

bug: 62184825
Test: Cell broadcast receiver unit tests
Change-Id: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
---
 src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 5e4864c0..17c7c956 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -442,6 +442,8 @@ public class CellBroadcastAlertService extends Service {
                         }
                         return false;
                     }
+
+                    return emergencyAlertEnabled;
                 }
             }
         }
-- 
cgit v1.2.3


From 870e7946cce18a8c86388f44882e2c0177fe938e Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Mon, 10 Jul 2017 14:43:12 -0700
Subject: Added extra message enabled check when receiving alerts

Though we are not supposed to receive messages that are
not enabled, it is still safer to add extra enablement check
when receiving the alerts.

bug: 62184825
Test: Cell broadcast receiver unit tests
Merged-In: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
Change-Id: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
---
 src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 57724146..7ca79785 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -409,6 +409,7 @@ public class CellBroadcastAlertService extends Service {
                     if (isRoaming(message.getSubId())) {
                         return false;
                     }
+                    return emergencyAlertEnabled;
                 }
             }
         }
-- 
cgit v1.2.3


From 19878f8d33c6247736c76e78030dcbb602810a3a Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 11 Jul 2017 11:13:18 -0700
Subject: Made message body duplicate detection customizable

For all Japanese carriers, we should consider message
body when performing duplicate detection.

Test: Manual
bug: 62184395
Change-Id: I044b9c8d2e0fe71567ac5ae4fc0abf33284fb487
---
 res/values-mcc440/config.xml                                  |  2 ++
 res/values-mcc441/config.xml                                  |  5 +++++
 res/values/config.xml                                         |  2 ++
 .../cellbroadcastreceiver/CellBroadcastAlertService.java      | 11 +++++------
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/res/values-mcc440/config.xml b/res/values-mcc440/config.xml
index 6a80539b..31a8fcda 100644
--- a/res/values-mcc440/config.xml
+++ b/res/values-mcc440/config.xml
@@ -21,4 +21,6 @@
     <!-- Whether to always sound CBS alerts at full volume -->
     <!-- By default it's true for Japanese users -->
     <bool name="use_full_volume">true</bool>
+    <!-- Whether to compare message body when performing message duplicate dection -->
+    <bool name="duplicate_compare_body">true</bool>
 </resources>
diff --git a/res/values-mcc441/config.xml b/res/values-mcc441/config.xml
index ca58e7f5..31a8fcda 100644
--- a/res/values-mcc441/config.xml
+++ b/res/values-mcc441/config.xml
@@ -18,4 +18,9 @@
     <!-- Whether to enable CMAS settings (United States) -->
     <!-- No need to show this for Japanese users -->
     <bool name="show_cmas_settings">false</bool>
+    <!-- Whether to always sound CBS alerts at full volume -->
+    <!-- By default it's true for Japanese users -->
+    <bool name="use_full_volume">true</bool>
+    <!-- Whether to compare message body when performing message duplicate dection -->
+    <bool name="duplicate_compare_body">true</bool>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index db592ae8..0e4d2ac5 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -27,4 +27,6 @@
     <string-array name="additional_cbs_channels_strings" translatable="false"></string-array>
     <!-- Emergecny alert tone duration in milliseconds. -1 indicates playing the tone with the tone's duration -->
     <integer name="alert_duration">-1</integer>
+    <!-- Whether to compare message body when performing message duplicate dection -->
+    <bool name="duplicate_compare_body">false</bool>
 </resources>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 17c7c956..d80bff7e 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -244,12 +244,11 @@ public class CellBroadcastAlertService extends Service {
             return;
         }
 
-        // If this is an ETWS message, then we want to include the body message to be a factor for
-        // duplication detection. We found that some Japanese carriers send ETWS messages
-        // with the same serial number, therefore the subsequent messages were all ignored.
-        // In the other hand, US carriers have the requirement that only serial number, location,
-        // and category should be used for duplicate detection.
-        int hashCode = message.isEtwsMessage() ? message.getMessageBody().hashCode() : 0;
+        // Check if message body should be used for duplicate detection.
+        boolean shouldCompareMessageBody =
+                getApplicationContext().getResources().getBoolean(R.bool.duplicate_compare_body);
+
+        int hashCode = shouldCompareMessageBody ? message.getMessageBody().hashCode() : 0;
 
         // If this is an ETWS message, we need to include primary/secondary message information to
         // be a factor for duplication detection as well. Per 3GPP TS 23.041 section 8.2,
-- 
cgit v1.2.3


From 2892619a6725e83fb07bb947d99866f3d20978be Mon Sep 17 00:00:00 2001
From: Martin Brabham <optedoblivion@google.com>
Date: Fri, 23 Jun 2017 12:17:51 -0700
Subject: DO NOT MERGE ANYWHERE: Change the title to "Wireless emergency
 alerts"

Bug: 37688456
Test: Manual
Change-Id: I53512f736eae48af66e775e10a36f28ad29e918d
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09724fb2..9235fff2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -277,5 +277,5 @@
     </integer-array>
 
     <!-- Label to open emergencyNotifications dialog [CHAR LIMIT=40] -->
-    <string name="emergency_alert_settings_title_watches">Emergency notifications</string>
+    <string name="emergency_alert_settings_title_watches">Wireless emergency alerts</string>
 </resources>
-- 
cgit v1.2.3