Snap for 10483872 from 11e40371957e26e6d74136da62f1d8ce1783d671 to mainline-tethering-releaseaml_tet_340913030

Change-Id: I9d0c40021458b98dfa53b417e9702ada15fc80a8

6 files changed, 279 insertions, 23 deletions

diff --git a/res/values-mcc219-mnc01/config.xml b/res/values-mcc219-mnc01/config.xml
deleted file mode 100644
index 7d3520880..000000000
--- a/res/values-mcc219-mnc01/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
-    <!-- Main toggle default value -->
-    <bool name="master_toggle_enabled_default">false</bool>
-</resources>
diff --git a/res/values-mcc219-mnc20 b/res/values-mcc219-mnc20
deleted file mode 120000
index ff9e22dfb..000000000
--- a/res/values-mcc219-mnc20
+++ /dev/null
@@ -1 +0,0 @@
-values-mcc219-mnc01
\ No newline at end of file
diff --git a/res/values-mcc219/config.xml b/res/values-mcc219/config.xml
new file mode 100644
index 000000000..fd0b53eab
--- /dev/null
+++ b/res/values-mcc219/config.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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>
+    <!-- 4370, 4383 EU-Alert level 1 -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=300000, always_on=true, override_dnd=true, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffff0000|300000</item>
+        <!-- additional language -->
+        <item>0x111F:rat=gsm, emergency=true, alert_duration=300000, always_on=true, override_dnd=true, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffff0000|300000</item>
+    </string-array>
+    <!-- 4371, 4384 EU-Alert level 2 -->
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+        <item>0x1113:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffff0000|16500</item>
+        <!-- additional language -->
+        <item>0x1120:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffff0000|16500</item>
+    </string-array>
+    <!-- 4373, 4386 EU-Alert level 3 -->
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false">
+        <item>0x1115:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+        <!-- additional language -->
+        <item>0x1122:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+    </string-array>
+    <!-- 4396, 4397 EU-Alert level 4 -->
+    <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+        <item>0x112C:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+        <!-- additional language -->
+        <item>0x112D:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+    </string-array>
+    <!-- 6400 EU-Info -->
+    <string-array name="emergency_alerts_channels_range_strings" translatable="false">
+        <item>0x1900:rat=gsm, emergency=true, type=info</item>
+    </string-array>
+    <!-- 4379, 4392 EU-Amber -->
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+        <item>0x111B:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffbf00|16500</item>
+        <!-- additional language -->
+        <item>0x1128:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffbf00|16500</item>
+    </string-array>
+    <!-- 4380, 4393 EU-Monthly Test -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C:rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1129:rat=gsm, emergency=true</item>
+    </string-array>
+    <!-- 4398, 4399 EU-test -->
+    <string-array name="state_local_test_alert_range_strings" translatable="false">
+        <item>0x112E:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+        <!-- additional language -->
+        <item>0x112F:rat=gsm, emergency=true, alert_duration=16500, vibration=0|1000|500|1000|500|1000|500|2000|500|2000|500|2000|500|1000|500|1000|500|1000|500, pulsation=0xffffffff|16500</item>
+    </string-array>
+    <!-- 4381, 4394 EU-Exercise -->
+    <string-array name="exercise_alert_range_strings" translatable="false">
+        <item>0x111D:rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x112A:rat=gsm, emergency=true</item>
+    </string-array>
+    <!-- 4382, 4395 EU-Reserved -->
+    <string-array name="operator_defined_alert_range_strings" translatable="false">
+        <item>0x111E:rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x112B:rat=gsm, emergency=true</item>
+    </string-array>
+
+    <!-- Whether to display presidential alert in the settings -->
+    <bool name="show_presidential_alerts_settings">true</bool>
+    <!-- Whether to show test settings -->
+    <bool name="show_test_settings">false</bool>
+    <!-- whether to display a separate operator defined test settings. -->
+    <bool name="show_separate_operator_defined_settings">true</bool>
+    <!-- To display a separate exercise test settings. -->
+    <bool name="show_separate_exercise_settings">true</bool>
+
+    <!-- Emergency alerts toggle default value -->
+    <bool name="emergency_alerts_enabled_default">false</bool>
+
+    <string-array name="etws_alerts_range_strings" translatable="false" />
+    <string-array name="etws_test_alerts_range_strings" translatable="false" />
+</resources>
diff --git a/res/values-mcc219/strings.xml b/res/values-mcc219/strings.xml
new file mode 100644
index 000000000..fea40a57f
--- /dev/null
+++ b/res/values-mcc219/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2023 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">HR-ALERT</string>
+    <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
+    <string name="cmas_extreme_alert">@string/cmas_presidential_level_alert</string>
+    <!-- CMAS dialog title for severe alert. [CHAR LIMIT=50] -->
+    <string name="cmas_severe_alert">@string/cmas_presidential_level_alert</string>
+    <!-- CMAS dialog title for child abduction emergency (Amber Alert). [CHAR LIMIT=50] -->
+    <string name="cmas_amber_alert" translatable="false">HR-AMBER</string>
+    <!-- CMAS dialog title for required monthly test. [CHAR LIMIT=50] -->
+    <string name="cmas_required_monthly_test" translatable="false">Cell Broadcast Test</string>
+    <!-- CMAS dialog title for CMAS Exercise. [CHAR LIMIT=50] -->
+    <string name="cmas_exercise_alert">@string/cmas_presidential_level_alert</string>
+    <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] -->
+    <string name="public_safety_message">@string/cmas_presidential_level_alert</string>
+    <!-- Dialog title or menu title of emergency alert. [CHAR LIMIT=50] -->
+    <string name="emergency_alert">@string/cmas_presidential_level_alert</string>
+    <!-- Dialog title for all state/local test alerts. [CHAR LIMIT=50] -->
+    <string name="state_local_test_alert">@string/cmas_presidential_level_alert</string>
+    <!-- CMAS dialog title for operator defined use. [CHAR LIMIT=50] -->
+    <string name="cmas_operator_defined_alert" translatable="false">EU Reserved</string>
+
+    <!-- Preference title for enable presidential threat alerts checkbox. [CHAR LIMIT=40] -->
+    <!-- Required Croatia(hr) translation for this message: Hitni alarm -->
+    <string name="enable_cmas_presidential_alerts_title">Emergency Alarm</string>
+    <!-- Preference title for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: Ekstremna opasnost -->
+    <string name="enable_cmas_extreme_threat_alerts_title">Extreme Danger</string>
+    <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: Značajna opasnost -->
+    <string name="enable_cmas_severe_threat_alerts_title">Significant Danger</string>
+    <!-- Preference title for enable CMAS amber alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: Nestalo dijete -->
+    <string name="enable_cmas_amber_alerts_title">Missing person</string>
+    <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: Cell Broadcast Test -->
+    <string name="enable_cmas_test_alerts_title">Cell Broadcast Test</string>
+    <!-- Preference title for exercise test alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: EU Exercise -->
+    <string name="enable_exercise_test_alerts_title">EU Exercise</string>
+    <!-- Preference title for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+    <!-- Required Croatia(hr) translation for this message: Informacije o opasnosti -->
+    <string name="enable_public_safety_messages_title">Hazard Information</string>
+    <!-- Preference title for enable emergency alerts messages checkbox. [CHAR LIMIT=100] -->
+    <!-- Required Croatia(hr) translation for this message: Informacije -->
+    <string name="enable_emergency_alerts_message_title">Information</string>
+    <!-- Preference summary for enable emergency alerts messages checkbox. [CHAR LIMIT=100] -->
+    <!-- Required Croatia(hr) translation for this message: Informacije poruke -->
+    <string name="enable_emergency_alerts_message_summary">Information messages</string>
+    <!-- Preference title for enable state/local test alerts checkbox. [CHAR LIMIT=100] -->
+    <!-- Required Croatia(hr) translation for this message: Testno upozorenje -->
+    <string name="enable_state_local_test_alerts_title">Test Warning</string>
+    <!-- Preference title for operator defined test alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- Required Croatia(hr) translation for this message: EU Reserved -->
+    <string name="enable_operator_defined_test_alerts_title">EU Reserved</string>
+</resources>
diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json
index ddbeb650d..9ac1e5cc6 100644
--- a/tests/compliancetests/assets/emergency_alert_channels.json
+++ b/tests/compliancetests/assets/emergency_alert_channels.json
@@ -4563,13 +4563,98 @@
   },
   "croatia_hrvatski": {
     "4370": {
-      "title": "Presidential alert",
+      "title": "HR-ALERT",
       "default_value": "true",
       "toggle_avail": "false"
     },
     "4383": {
-      "title": "Presidential alert",
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "4371": {
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4384": {
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4373": {
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4386": {
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4379": {
+      "title": "HR-AMBER",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4392": {
+      "title": "HR-AMBER",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4380": {
+      "title": "Cell Broadcast Test",
+      "default_value": "false",
+      "toggle_avail": "false"
+    },
+    "4393": {
+      "title": "Cell Broadcast Test",
+      "default_value": "false",
+      "toggle_avail": "false"
+    },
+    "4381": {
+      "title": "HR-ALERT",
+      "default_value": "false",
+      "toggle_avail": "false"
+    },
+    "4394": {
+      "title": "HR-ALERT",
+      "default_value": "false",
+      "toggle_avail": "false"
+    },
+    "4396": {
+      "title": "HR-ALERT",
       "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "4397": {
+      "title": "HR-ALERT",
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "6400": {
+      "title": "HR-ALERT",
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4398": {
+      "title": "HR-ALERT",
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4399": {
+      "title": "HR-ALERT",
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4382": {
+      "title": "EU Reserved",
+      "default_value": "false",
+      "toggle_avail": "false"
+    },
+    "4395": {
+      "title": "EU Reserved",
+      "default_value": "false",
       "toggle_avail": "false"
     }
   },
diff --git a/tests/compliancetests/assets/emergency_alert_settings.json b/tests/compliancetests/assets/emergency_alert_settings.json
index fe07bff51..76e9851ba 100644
--- a/tests/compliancetests/assets/emergency_alert_settings.json
+++ b/tests/compliancetests/assets/emergency_alert_settings.json
@@ -1137,6 +1137,34 @@
     }
   },
   "croatia_hrvatski": {
+    "Emergency Alarm": {
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "Extreme Danger": {
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "Significant Danger": {
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "Missing person": {
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "Hazard Information": {
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "Information": {
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "Test Warning": {
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
     "Vibration": {
       "default_value": "true",
       "toggle_avail": "true"