Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Change-Id: I62710cfc1e6b46429d4ca294e4787b8c5f747f6e
diff --git a/Android.bp b/Android.bp
index db3c109..1418276 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,7 +72,7 @@
manifest: "AndroidManifest_Platform.xml",
system_ext_specific: true,
privileged: true,
- required: ["privapp_allowlist_com.android.cellbroadcastreceiver.xml"],
+ required: ["platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml"],
}
// source file shared with legacy cellbroadcast app
diff --git a/apex/permissions/Android.bp b/apex/permissions/Android.bp
index 392cd72..931d8c5 100644
--- a/apex/permissions/Android.bp
+++ b/apex/permissions/Android.bp
@@ -25,13 +25,22 @@
installable: false,
}
+// For platform only variant
prebuilt_etc {
- name: "privapp_allowlist_com.android.cellbroadcastreceiver.xml",
+ name: "platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml",
sub_dir: "permissions",
src: "com.android.cellbroadcastreceiver.xml",
system_ext_specific: true,
visibility: ["//packages/apps/CellBroadcastReceiver"],
- installable: false,
+ installable: true,
+}
+
+// For platform only variant
+prebuilt_etc {
+ name: "platform_privapp_allowlist_com.android.cellbroadcastservice.xml",
+ sub_dir: "permissions",
+ src: "com.android.cellbroadcastservice.xml",
+ installable: true,
}
prebuilt_etc {
diff --git a/res/values-mcc222/config.xml b/res/values-mcc222/config.xml
index ef2b727..bd3a810 100644
--- a/res/values-mcc222/config.xml
+++ b/res/values-mcc222/config.xml
@@ -31,13 +31,13 @@
<!-- 4379, 4392 -->
<!-- group IT-Alet Level 1,2,3 together, controlled by a single user settings -->
<string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
- <item>0x1113:rat=gsm, emergency=true</item>
- <item>0x1117:rat=gsm, emergency=true</item>
- <item>0x111B:rat=gsm, emergency=true</item>
+ <item>0x1113-0x1113:rat=gsm, emergency=true</item>
+ <item>0x1117-0x1117:rat=gsm, emergency=true</item>
+ <item>0x111B-0x111B:rat=gsm, emergency=true</item>
<!-- additional language -->
- <item>0x1120:rat=gsm, emergency=true, filter_language=true</item>
- <item>0x1124:rat=gsm, emergency=true, filter_language=true</item>
- <item>0x1128:rat=gsm, emergency=true, filter_language=true</item>
+ <item>0x1120-0x1120:rat=gsm, emergency=true</item>
+ <item>0x1124-0x1124:rat=gsm, emergency=true</item>
+ <item>0x1128-0x1128:rat=gsm, emergency=true</item>
</string-array>
<!-- 4381, 4394 -->
diff --git a/res/values-mcc234/config.xml b/res/values-mcc234/config.xml
index 87ea37b..717f660 100644
--- a/res/values-mcc234/config.xml
+++ b/res/values-mcc234/config.xml
@@ -66,4 +66,7 @@
<!-- whether to display a separate exercise test settings. today, most of time, exercise channels was controlled by the main test toggle. -->
<bool name="show_separate_exercise_settings">true</bool>
<bool name="show_test_settings">false</bool>
+
+ <!-- Whether to always sound CBS alerts at full volume -->
+ <bool name="use_full_volume">true</bool>
</resources>
diff --git a/res/values-mcc235/config.xml b/res/values-mcc235/config.xml
new file mode 100644
index 0000000..b29b5d1
--- /dev/null
+++ b/res/values-mcc235/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Whether to always sound CBS alerts at full volume -->
+ <bool name="use_full_volume">true</bool>
+
+ <!-- 4379, 4392 -->
+ <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
+</resources>
diff --git a/res/values-mcc235/strings.xml b/res/values-mcc235/strings.xml
new file mode 100644
index 0000000..996f0cb
--- /dev/null
+++ b/res/values-mcc235/strings.xml
@@ -0,0 +1,19 @@
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- CMAS dialog title for presidential level alert. [CHAR LIMIT=50] -->
+ <string name="cmas_presidential_level_alert" translatable="false">Government alert</string>
+</resources>