Snap for 8857176 from 66ba55ff241668864ae8ada24fb9dd61380ae6f7 to mainline-go-mediaprovider-releaseaml_go_mpr_330912000android13-mainline-go-mediaprovider-release

Change-Id: I7708d8e9c9f07c99a9f039a13446f8a2d501e610

10 files changed, 12 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 9e138870d..3a8313d97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,7 +7,7 @@ package {
 java_defaults {
     name: "CellBroadcastCommon",
     min_sdk_version: "30",
-    target_sdk_version: "31",
+    target_sdk_version: "33",
     sdk_version: "module_current",
     privileged: true,
     srcs: [
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index d672718e0..bbf4ddbec 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,7 @@
 {
   "name": "com.android.cellbroadcast",
-  "version": 339990000
+
+  // Placeholder module version to be replaced during build.
+  // Do not change!
+  "version": 0
 }
diff --git a/res/values-mcc001-zu/strings.xml b/res/values-mcc001-zu/strings.xml
index bc3f6d0bc..71c7a3fd2 100644
--- a/res/values-mcc001-zu/strings.xml
+++ b/res/values-mcc001-zu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="6380811692570868097">"Isi-Spanish"</string>
+    <string name="receive_cmas_in_second_language_title" msgid="6380811692570868097">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="2747100010816713897">"Thola izexwayiso zesimo esiphuthumayo nge-Spanish uma kukhonakala"</string>
 </resources>
diff --git a/res/values-mcc234-my/strings.xml b/res/values-mcc234-my/strings.xml
index bf376887f..ec3b12fb4 100644
--- a/res/values-mcc234-my/strings.xml
+++ b/res/values-mcc234-my/strings.xml
@@ -32,7 +32,7 @@
     <string name="app_label" msgid="3863159788297913185">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"အရေးပေါ်သတိပေးချက် အကြောင်းကြားချက်များကို လက်ခံသည်"</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် စာသားမှ စကားပြောသို့ကို အသုံးပြုသည်"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် စာ-မှ-စကား ကို အသုံးပြုသည်"</string>
     <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"လောလောဆယ်တွင် အရေးပေါ်သတိပေးချက်များကို ရရှိနေသည်။ အရေးပေါ်သတိပေးချက်များကို ဆက်လက်ရယူလိုပါသလား။"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"အရေးပေါ်သတိပေးချက် ဆက်တင်များကို ကြည့်ရန် တို့ပါ"</string>
diff --git a/res/values-mcc234-pt-rPT/strings.xml b/res/values-mcc234-pt-rPT/strings.xml
index b17e3fb83..ca7da65f4 100644
--- a/res/values-mcc234-pt-rPT/strings.xml
+++ b/res/values-mcc234-pt-rPT/strings.xml
@@ -32,7 +32,7 @@
     <string name="app_label" msgid="3863159788297913185">"Alertas de emergência"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emergência"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receba notificações de alertas de emergência."</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utilize a síntese de voz para dizer mensagens de alerta de emergência."</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utilize a conversão de texto em voz para dizer mensagens de alerta de emergência."</string>
     <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Atualmente, está a receber alertas de emergência. Pretende continuar a receber alertas de emergência?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emergência"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toque para ver as definições dos alertas de emergência"</string>
diff --git a/res/values-mcc310-zu/strings.xml b/res/values-mcc310-zu/strings.xml
index a912ffc3a..d2cf46222 100644
--- a/res/values-mcc310-zu/strings.xml
+++ b/res/values-mcc310-zu/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Isi-Spanish"</string>
+    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Thola izexwayiso zesimo esiphuthumayo nge-Spanish uma kukhonakala"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Susa lesi sexwayiso?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Susa zonke izexwayiso ozitholile?"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index d4c594739..df38801b2 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -64,7 +64,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"ကြိုးမဲ့ အရေးပေါ် သတိပေးအကြောင်းကြားချက် လက်ခံရန်"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"အရေးပေါ်သတိပေးချက်"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"စကားပြော သတိပေးမက်ဆေ့ဂျ်"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"ကြိုးမဲ့ အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် \'စာသားမှ စကားပြောသို့\' ကိုအသုံးပြုပါ"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"ကြိုးမဲ့ အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် \'စာ-မှ-စကား\' ကိုအသုံးပြုပါ"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"သတိပေးချက်အသံကို ပုံမှန်အကျယ်ဖြင့် ဖွင့်ပါမည်"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"အရေးပေါ်သတိပေးချက် မှတ်တမ်း"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"သတိပေးချက် ရွေးချယ်မှုများ"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index d3e64ef60..0a9c669e7 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -35,7 +35,7 @@
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"ଏହି ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରିବେ?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"ପ୍ରାପ୍ତ କରିଥିବା ସମସ୍ତ ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌ ଡିଲିଟ୍‌ କରିବେ?"</string>
     <string name="button_delete" msgid="4672451757925194350">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="button_cancel" msgid="7479958360523246140">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="button_cancel" msgid="7479958360523246140">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"ଭୂମିକମ୍ପ ଚେତାବନୀ"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"ସୁନାମି ଚେତାବନୀ"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"ଭୂମିକମ୍ପ ଏବଂ ସୁନାମି ଚେତାବନୀ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f7191c94a..8200f8812 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -64,7 +64,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receber notificações de alerta de emergência sem fios"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lembrete de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dizer mensagem de alerta"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utilize a síntese de voz para dizer mensagens de alertas de emergência sem fios."</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utilize a conversão de texto em voz para dizer mensagens de alertas de emergência sem fios."</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Será reproduzido um som de lembrete com o volume normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histórico de alertas de emergência"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferências de alerta"</string>
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverMetricsTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverMetricsTest.java
index b589d3fe6..10b36b2a0 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverMetricsTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverMetricsTest.java
@@ -114,7 +114,6 @@ public class CellBroadcastReceiverMetricsTest extends CellBroadcastTest {
 
     @Test
     public void testGetFeatureMetrics() {
-        doReturn(null).when(mContext).getSharedPreferences(anyString(), anyInt());
         CellBroadcastReceiverMetrics.FeatureMetrics testFeatureMetrics =
                 CellBroadcastReceiverMetrics.getInstance().getFeatureMetrics(mContext);
         CellBroadcastReceiverMetrics.FeatureMetrics testFeatureMetricsClone =
@@ -122,8 +121,6 @@ public class CellBroadcastReceiverMetricsTest extends CellBroadcastTest {
 
         assertSame(testFeatureMetrics, testFeatureMetricsClone);
 
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-
         doReturn(false).when(mSharedPreferences)
                 .getBoolean(ALERT_IN_CALL, false);
         doReturn(String.valueOf(0)).when(mSharedPreferences)