diff options
author | Hyosun Kim <hyosunkim@google.com> | 2024-02-14 09:07:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2024-02-14 09:07:34 +0000 |
commit | 5859b7d1355217b47527c267514e8cdb6af65fed (patch) | |
tree | 768fa1d1f9520d09d0207297dab8bbe2173fca9c | |
parent | 8479e0dca93122047d84e038198298d82179f76f (diff) | |
parent | e3c6f9096de9085ffea1db22ed57d476f854b67a (diff) | |
download | CellBroadcastReceiver-5859b7d1355217b47527c267514e8cdb6af65fed.tar.gz |
Merge "[NL-Alert] Support WHAM requirement from the NL" into udc-mainline-prod
-rw-r--r-- | res/values-mcc204/config.xml | 5 | ||||
-rw-r--r-- | tests/compliancetests/assets/emergency_alert_channels.json | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values-mcc204/config.xml b/res/values-mcc204/config.xml index 4c2a29750..583970fed 100644 --- a/res/values-mcc204/config.xml +++ b/res/values-mcc204/config.xml @@ -31,6 +31,11 @@ <string-array name="public_safety_messages_channels_range_strings" translatable="false"> <item>0x1113:rat=gsm, emergency=true, override_dnd=true</item> </string-array> + <!-- Channels to receive geo-fencing trigger messages --> + <string-array name="geo_fencing_trigger_messages_range_strings" translatable="false"> + <!-- geo-fencing trigger messages --> + <item>0x1130:rat=gsm, emergency=true</item> + </string-array> <!-- Whether to show test settings --> <bool name="show_test_settings">false</bool> </resources> diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json index a82ae97c4..4edb0604c 100644 --- a/tests/compliancetests/assets/emergency_alert_channels.json +++ b/tests/compliancetests/assets/emergency_alert_channels.json @@ -1217,6 +1217,11 @@ "title": "", "default_value": "true", "toggle_avail": "false" + }, + "4400": { + "title": "", + "default_value": "true", + "toggle_avail": "false" } }, "romania": { |