diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-17 21:19:44 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-17 21:19:53 +0000 |
| commit | 4d69fe98e456854b1ca113009eb3574f8417a6ce (patch) | |
| tree | e7aa66a346400721ccce8ae333bccdebf7b6b987 | |
| parent | ec7e996ddc6c07549ada7e3efdfd15c74dedea68 (diff) | |
| parent | 7129495a1d6ab2a40722d4782543971d5e402a67 (diff) | |
| download | CellBroadcastReceiver-android14-mainline-cellbroadcast-release.tar.gz | |
Make change and version bump to aml_cbr_341410010 for mainline module file: apex/apex_manifest.jsonaml_cbr_341410010android14-mainline-cellbroadcast-release
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25913028'] into sparse-11165577-L84600030001389706.
SPARSE_CHANGE: If0145e46b747904b3af8a23d86659810db8b57c5
Change-Id: Ibff50b43a216ebbeee13e191d214f7f901a37a0a
| -rw-r--r-- | apex/apex_manifest.json | 2 | ||||
| -rw-r--r-- | res/values-mcc440-mnc20/config.xml | 7 | ||||
| -rw-r--r-- | tests/compliancetests/assets/emergency_alert_channels.json | 37 |
3 files changed, 45 insertions, 1 deletions
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json index 43f54e7bb..d08cd205f 100644 --- a/apex/apex_manifest.json +++ b/apex/apex_manifest.json @@ -3,5 +3,5 @@ // Placeholder module version to be replaced during build. // Do not change! - "version": 341410000 + "version": 341410010 } diff --git a/res/values-mcc440-mnc20/config.xml b/res/values-mcc440-mnc20/config.xml index 3bdcd9edb..ee877aa10 100644 --- a/res/values-mcc440-mnc20/config.xml +++ b/res/values-mcc440-mnc20/config.xml @@ -19,6 +19,13 @@ <string-array name="etws_test_alerts_range_strings" translatable="false"> <item>0x1103:rat=gsm, emergency=true, debug_build=true</item> </string-array> + <string-array name="additional_cbs_channels_strings" translatable="false"> + <item>0xA800:type=etws_earthquake, emergency=true, scope=carrier</item> + <item>0xAFEE:type=etws_tsunami, emergency=true, scope=carrier</item> + <item>0xAC00-0xAFED:type=other, emergency=true, scope=carrier</item> + <item>0xA802:type=test, emergency=true, scope=carrier</item> + <item>0xA804:type=test, emergency=true, scope=carrier</item> + </string-array> <!-- Whether to show test settings --> <bool name="show_test_settings">false</bool> <bool name="allow_testing_mode_on_user_build">false</bool> diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json index 21cd5c84c..a82ae97c4 100644 --- a/tests/compliancetests/assets/emergency_alert_channels.json +++ b/tests/compliancetests/assets/emergency_alert_channels.json @@ -687,6 +687,43 @@ "title": "子供の誘拐（誘拐事件速報）", //"Child abduction (Amber alert)", "default_value": "true", "toggle_avail": "true" + }, + "43008": { + "title": "緊急地震速報", //"Earthquake warning", + "default_value": "true", + "toggle_avail": "false" + }, + "45038": { + "title": "津波警報", //"Tsunami warning", + "default_value": "true", + "toggle_avail": "false", + "warning_type": "02" + }, + "44032": { + "title": "緊急速報メール", //"Emergency warning", + "default_value": "true", + "toggle_avail": "false", + "end_channel": "45037" + }, + "45000": { + "title": "緊急速報メール", //"Emergency warning", + "default_value": "true", + "toggle_avail": "false" + }, + "45037": { + "title": "緊急速報メール", //"Emergency warning", + "default_value": "true", + "toggle_avail": "false" + }, + "43010": { + "title": "ETWS 試験メッセージ", //"ETWS test message", + "default_value": "false", + "toggle_avail": "false" + }, + "43012": { + "title": "ETWS 試験メッセージ", //"ETWS test message", + "default_value": "false", + "toggle_avail": "false" } }, "hongkong": { |