diff options
author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-04-27 05:29:00 +0000 |
---|---|---|
committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-04-27 05:29:00 +0000 |
commit | 14cfa3b44d419e003d3aac7bb86c81b7bc24ad26 (patch) | |
tree | 5fd5cba9bd567db262420ee86ebcd7ce1ca55f4a | |
parent | f7377f44031fea2eb6a735a572a124d29026e528 (diff) | |
parent | a6658c85be7976ae6767746be71a321da90f3081 (diff) | |
download | CellBroadcastReceiver-14cfa3b44d419e003d3aac7bb86c81b7bc24ad26.tar.gz |
[automerge] Support emergency alert for India 2p: a6658c85be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/22760238
Bug: 277852306
Change-Id: I258325aaf8e0893a66ef44b8b6f0a3f1df1482a2
-rw-r--r-- | res/values-mcc404/config.xml | 69 | ||||
-rw-r--r-- | tests/compliancetests/assets/emergency_alert_channels.json | 19 | ||||
-rw-r--r-- | tests/compliancetests/assets/emergency_alert_settings.json | 12 |
3 files changed, 73 insertions, 27 deletions
diff --git a/res/values-mcc404/config.xml b/res/values-mcc404/config.xml index aefa45bcb..309d30c8c 100644 --- a/res/values-mcc404/config.xml +++ b/res/values-mcc404/config.xml @@ -15,10 +15,69 @@ --> <resources> - <string-array name="additional_cbs_channels_strings" translatable="false"> - <!-- Channel 60 for area update info is required by Indian government --> - <item>0x03C:type=area, emergency=false</item> + <!-- Whether to show extreme alert settings --> + <bool name="show_extreme_alert_settings">false</bool> + <!-- Whether to show severe alert settings --> + <bool name="show_severe_alert_settings">false</bool> + + <!-- 4370, 4383 --> + <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"> + <item>0x1112:rat=gsm, emergency=true, always_on=true, alert_duration=31500</item> + <item>0x1000:rat=cdma, emergency=true, always_on=true, alert_duration=31500</item> + <!-- additional language --> + <item>0x111F:rat=gsm, emergency=true, always_on=true, alert_duration=31500</item> + </string-array> + <!-- 4371~4372, 4384~4385 --> + <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"> + <item>0x1113-0x1114:rat=gsm, emergency=true, alert_duration=31500, always_on=true</item> + <item>0x1001:rat=cdma, emergency=true, alert_duration=31500, always_on=true</item> + <!-- additional language --> + <item>0x1120-0x1121:rat=gsm, emergency=true, alert_duration=31500, always_on=true</item> + </string-array> + <!-- 4373~4378, 4386~4391 --> + <string-array name="cmas_alerts_severe_range_strings" translatable="false"> + <item>0x1115-0x111A:rat=gsm, emergency=true, alert_duration=31500, always_on=true</item> + <item>0x1002:rat=cdma, emergency=true, alert_duration=31500, always_on=true</item> + <!-- additional language --> + <item>0x1122-0x1127:rat=gsm, emergency=true, alert_duration=31500, always_on=true</item> + </string-array> + <!-- 4379, 4392 --> + <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"> + <item>0x111B:rat=gsm, emergency=true, alert_duration=31500</item> + <item>0x1003:rat=cdma, emergency=true, alert_duration=31500</item> + <!-- additional language --> + <item>0x1128:rat=gsm, emergency=true, alert_duration=31500</item> + </string-array> + <!-- 4380~4382, 4393~4395 --> + <string-array name="required_monthly_test_range_strings" translatable="false"> + <item>0x111C:rat=gsm, emergency=true, alert_duration=31500</item> + <item>0x1004:rat=cdma, emergency=true, alert_duration=31500</item> + <!-- additional language --> + <item>0x1129:rat=gsm, emergency=true, alert_duration=31500</item> + </string-array> + <string-array name="exercise_alert_range_strings" translatable="false"> + <item>0x111D:rat=gsm, emergency=true, alert_duration=31500</item> + <!-- additional language --> + <item>0x112A:rat=gsm, emergency=true, alert_duration=31500</item> </string-array> - <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> - <bool name="config_showAreaUpdateInfoSettings">true</bool> + <string-array name="operator_defined_alert_range_strings" translatable="false"> + <item>0x111E:rat=gsm, emergency=true, alert_duration=31500</item> + <!-- additional language --> + <item>0x112B:rat=gsm, emergency=true, alert_duration=31500</item> + </string-array> + + <!-- 4352~4354, 4356 --> + <string-array name="etws_alerts_range_strings" translatable="false"> + <item>0x1100-0x1102:rat=gsm, emergency=true, alert_duration=31500</item> + <item>0x1104:rat=gsm, emergency=true, alert_duration=31500</item> + </string-array> + <!-- 4355--> + <string-array name="etws_test_alerts_range_strings" translatable="false"> + <item>0x1103:rat=gsm, emergency=true, alert_duration=31500</item> + </string-array> + + <!-- Whether to disable the status bar while alert is showing, not allow + users to interact with other activities until pressing the "ok" button --> + <bool name="disable_status_bar">true</bool> + </resources> diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json index 87d99e0a0..3a032f0e1 100644 --- a/tests/compliancetests/assets/emergency_alert_channels.json +++ b/tests/compliancetests/assets/emergency_alert_channels.json @@ -4356,6 +4356,11 @@ "toggle_avail": "false", "end_channel": "4354" }, + "4355": { + "title": "", + "default_value": "false", + "toggle_avail": "true" + }, "4356": { "title": "", "default_value": "true", @@ -4374,25 +4379,25 @@ "4371": { "title": "Emergency alert: Extreme", "default_value": "true", - "toggle_avail": "true", + "toggle_avail": "false", "end_channel": "4372" }, "4384": { "title": "Emergency alert: Extreme", "default_value": "true", - "toggle_avail": "true", + "toggle_avail": "false", "end_channel": "4385" }, "4373": { "title": "Emergency alert: Severe", "default_value": "true", - "toggle_avail": "true", + "toggle_avail": "false", "end_channel": "4378" }, "4386": { "title": "Emergency alert: Severe", "default_value": "true", - "toggle_avail": "true", + "toggle_avail": "false", "end_channel": "4391" }, "4379": { @@ -4434,12 +4439,6 @@ "title": "Emergency alert (operator)", "default_value": "false", "toggle_avail": "true" - }, - "60": { - "title": "Broadcast messages", - "default_value": "true", - "toggle_avail": "true", - "alert_type":"notification" } }, "hungary_telekom": { diff --git a/tests/compliancetests/assets/emergency_alert_settings.json b/tests/compliancetests/assets/emergency_alert_settings.json index d77accb47..41b54b2fa 100644 --- a/tests/compliancetests/assets/emergency_alert_settings.json +++ b/tests/compliancetests/assets/emergency_alert_settings.json @@ -1083,18 +1083,6 @@ } }, "india": { - "Area update broadcasts": { - "default_value": "true", - "toggle_avail": "true" - }, - "Extreme threats": { - "default_value": "true", - "toggle_avail": "true" - }, - "Severe threats": { - "default_value": "true", - "toggle_avail": "true" - }, "AMBER alerts": { "default_value": "true", "toggle_avail": "true" |