commit 49ed2e71e928fa17e638a7065cb433e4a20d1764
author Jordan Liu <jminjie@google.com> Wed Jun 17 17:56:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 17 17:56:40 2020 +0000
tree 336bbc3d0252d5cb6388c13ad93e3de019ebbbd4
parent 96a0e2670e44dde4aa31225244384252984d9fc9
parent 2d5e647ba68ab3e8e319adf7733c6c019f9913b0

Merge "Add channels for Turkey"

res/values-mcc202/config.xml

diff --git a/res/values-mcc202/config.xml b/res/values-mcc202/config.xml
index f03be43..155ecac 100644
--- a/res/values-mcc202/config.xml
+++ b/res/values-mcc202/config.xml
@@ -35,7 +35,10 @@
         <item>0x398:rat=gsm, emergency=true</item>
     </string-array>
     <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
-    <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
+    <!-- 4381 -->
+    <string-array name="exercise_alert_range_strings" translatable="false">
+            <item>0x111D:rat=gsm, emergency=true</item>
+    </string-array>
     <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
     <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
-</resources>
\ No newline at end of file
+</resources>

res/values-mcc730/config.xml

diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 520db07..11ea120 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml
@@ -45,9 +45,10 @@
     <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
         <item>0x111B:rat=gsm, emergency=true, alert_duration=86400000</item>
     </string-array>
-    <!-- 4380 ~ 4382 -->
+    <!-- 4380~4382, 519 -->
     <string-array name="required_monthly_test_range_strings" translatable="false">
         <item>0x111C:rat=gsm, emergency=true, alert_duration=86400000</item>
+        <item>0x207:rat=gsm, emergency=true, alert_duration=86400000</item>
     </string-array>
     <string-array name="exercise_alert_range_strings" translatable="false">
         <item>0x111D:rat=gsm, emergency=true, alert_duration=86400000</item>

res/values-mcc730/strings.xml

diff --git a/res/values-mcc730/strings.xml b/res/values-mcc730/strings.xml
index ca3c38d..8d843a4 100644
--- a/res/values-mcc730/strings.xml
+++ b/res/values-mcc730/strings.xml
@@ -19,6 +19,10 @@
     <!-- Special Chile requirement for the presidential alert title -->
     <string name="cmas_presidential_level_alert" translatable="false">@string/emergency_alert</string>
     <string name="public_safety_message" translatable="false">@string/emergency_alert</string>
+    <!-- CMAS dialog title for required monthly test. [CHAR LIMIT=50]
+         Dialog title used on devices with Spanish SIMs.
+         Required Spanish (es) translation for this message: "Mensaje de Prueba" -->
+    <string name="cmas_required_monthly_test">Test Message</string>
 </resources>
 
 

src/com/android/cellbroadcastreceiver/CellBroadcastResources.java

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
index 6759684..70e80c1 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
@@ -428,7 +428,7 @@
                     }
                 }
             }
-            return R.string.pws_other_message_identifiers;
+            return -1;
         }
         return -1;
     }