commit bc4661c1d757fe0003069dce04e80445f61e19af
author Jack Yu <jackyu@google.com> Fri Jul 22 15:39:09 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Aug 11 19:55:45 2016 -0700
tree fc7c48b60215bbd3e5da8514054bc60491918cf0
parent fa4425af586c051e22e214635fb1ff1e85bf45ef

Fixed that emergency messages are not enabled for Japanese carriers

The emergency ETWS (Earthquake and Tsunami Warning System) other
messages were not enabled during boot up. Added the corresponding
channel 4356 (0x1104) into the configuration list.

bug: 30295364
Change-Id: Ib9d0765d418b26b38c0f5047039c5c7ea9fbd714

src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index 451f9a7..a7273fb 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -344,12 +344,18 @@
 
         /** Enable GSM ETWS series messages. */
 
-        // Enable/Disable GSM ETWS messages.
+        // Enable/Disable GSM ETWS messages (4352 ~ 4354).
         setCellBroadcastRange(manager, enableEtwsAlerts,
                 SmsManager.CELL_BROADCAST_RAN_TYPE_GSM,
                 SmsCbConstants.MESSAGE_ID_ETWS_EARTHQUAKE_WARNING,
                 SmsCbConstants.MESSAGE_ID_ETWS_EARTHQUAKE_AND_TSUNAMI_WARNING);
 
+        // Enable/Disable GSM ETWS other messages (4356).
+        setCellBroadcastRange(manager, enableEtwsAlerts,
+                SmsManager.CELL_BROADCAST_RAN_TYPE_GSM,
+                SmsCbConstants.MESSAGE_ID_ETWS_OTHER_EMERGENCY_TYPE,
+                SmsCbConstants.MESSAGE_ID_ETWS_OTHER_EMERGENCY_TYPE);
+
         // Enable/Disable GSM ETWS test messages (4355).
         setCellBroadcastRange(manager, enableEtwsTestAlerts,
                 SmsManager.CELL_BROADCAST_RAN_TYPE_GSM,