commit f4177dd62a9a21ab5fa2c7a36545bd6cd0d35c94
author Zach Jang <zachjang@google.com> Mon Aug 08 22:25:24 2016 +0000
committer Zach Jang <zachjang@google.com> Tue Aug 09 00:52:13 2016 +0000
tree 912003c22db3a25ff0555e6c77e496f540083fcc
parent edbdbadc7f2708f20d511cff5a5189c4bbf08f66

Revert "Fixed that emergency messages are not enabled for Japanese carriers"

This reverts commit bc0c1a983dd8d83d5c84afe4a2fa1f3ae09bed42.

Change-Id: Iec4f7fd440eaf9f2b3c1eb9587556098a98a195a

src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index a7273fb..451f9a7 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -344,18 +344,12 @@
 
         /** Enable GSM ETWS series messages. */
 
-        // Enable/Disable GSM ETWS messages (4352 ~ 4354).
+        // Enable/Disable GSM ETWS messages.
         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,