summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2016-09-16 16:46:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-16 16:46:56 +0000
commit35947ed6c89eb4b154eea12bc8be1a2e31b21100 (patch)
treec5b0a2818e97db4cbea0e783fd62b968202d1da9
parent3051301802272b42af57d110af75ae4f2b48ca58 (diff)
parent667810a38ca9dfddb18a6efc18180d41f30dcc93 (diff)
downloadandroid_packages_apps_CarrierConfig-35947ed6c89eb4b154eea12bc8be1a2e31b21100.tar.gz
android_packages_apps_CarrierConfig-35947ed6c89eb4b154eea12bc8be1a2e31b21100.tar.bz2
android_packages_apps_CarrierConfig-35947ed6c89eb4b154eea12bc8be1a2e31b21100.zip
Merge "Fixed that carrier specific messages were not treated as emergency" into nyc-mr1-dev
-rw-r--r--assets/carrier_config_44020.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index e882afd..7b128e3 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -13,9 +13,9 @@
<int name="ims_dtmf_tone_delay_int" value="215" />
<boolean name="always_show_emergency_alert_onoff_bool" value="true" />
<string-array name="carrier_additional_cbs_channels_strings" num="3">
- <item value="0xA800:type=earthquake" />
- <item value="0xAFEE:type=tsunami" />
- <item value="0xAC00-0xAFED:type=other" />
+ <item value="0xA800:type=earthquake, emergency=true" />
+ <item value="0xAFEE:type=tsunami, emergency=true" />
+ <item value="0xAC00-0xAFED:type=other, emergency=true" />
</string-array>
</carrier_config>
</carrier_config_list>