commit 62816e2962fa483e769ecd52ee3d0bdcaf3e18f8
author Jack Yu <jackyu@google.com> Wed Aug 08 23:20:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 08 23:20:48 2018 +0000
tree ece691f66869dbd5d03d94898e41fb19f38a943c
parent 1dadc7d8cbf9585550982e9145822a52c33c9208
parent 4b022050c4b9b4c16b56dbe5b55446b7de9dd60a

Merge "Fixed emergency alerts for carriers"

res/values-mcc440-mnc50/config.xml

diff --git a/res/values-mcc440-mnc50/config.xml b/res/values-mcc440-mnc50/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc50/config.xml
+++ b/res/values-mcc440-mnc50/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>

res/values-mcc440-mnc51/config.xml

diff --git a/res/values-mcc440-mnc51/config.xml b/res/values-mcc440-mnc51/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc51/config.xml
+++ b/res/values-mcc440-mnc51/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>

res/values-mcc440-mnc52/config.xml

diff --git a/res/values-mcc440-mnc52/config.xml b/res/values-mcc440-mnc52/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc52/config.xml
+++ b/res/values-mcc440-mnc52/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>