From ac49569e7a92ac379ba1f0f4b9b55d31ef74e41c Mon Sep 17 00:00:00 2001 From: Alexei Nicoara Date: Tue, 5 Jul 2022 18:07:49 +0100 Subject: Setting apex version to the placeholder value When the apex version is set to 0, the version number will be replaced by the build system to the default value for the current branch. The default value for mainline module manifest version is stored in the defaultManifestVersion constant: https://android.googlesource.com/platform/build/soong/+/refs/heads/master/apex/constants.go#36 The version should not be changed manually in the manifest. Release tooling will set this version to the release version on the release branches. Test: presubmit Bug: 231691643 Change-Id: I30b5b486bca521ebdeed17dba7afc61f2c529ab8 Merged-In: I30b5b486bca521ebdeed17dba7afc61f2c529ab8 Ignore-AOSP-First: fixing merge conflicts --- apex/apex_manifest.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 } -- cgit v1.2.3 From 668b3521f671670631fe626eb4202e5927e80894 Mon Sep 17 00:00:00 2001 From: youngtaecha Date: Tue, 12 Jul 2022 17:59:21 +0000 Subject: CellBroadcast metrics improvement - Fix unit test error Bug: 238736192 Test: atest com.android.cellbroadcastreceiver.unit.CellBroadcastReceiverMetricsTest#testGetFeatureMetrics Change-Id: Ie3e57e955adba3f1322f3436a302ad8e2a176348 --- .../cellbroadcastreceiver/unit/CellBroadcastReceiverMetricsTest.java | 3 --- 1 file changed, 3 deletions(-) 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) -- cgit v1.2.3 From e81e4003c85563dbf5f2c687844c824551d41fff Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 03:02:13 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Id435f486afbda48426d1db18629558d80dd4e302 --- res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ "ଏହି ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରିବେ?" "ପ୍ରାପ୍ତ କରିଥିବା ସମସ୍ତ ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌ ଡିଲିଟ୍‌ କରିବେ?" "ଡିଲିଟ୍‌ କରନ୍ତୁ" - "ବାତିଲ୍‍ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" "ଭୂମିକମ୍ପ ଚେତାବନୀ" "ସୁନାମି ଚେତାବନୀ" "ଭୂମିକମ୍ପ ଏବଂ ସୁନାମି ଚେତାବନୀ" -- cgit v1.2.3 From 27bccce15d0913fed36c719fb5997a36d8954eb9 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 10:21:49 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7278003cbae4b28469f4bb096123f4e8458f48b8 --- res/values-mcc001-zu/strings.xml | 2 +- res/values-mcc234-my/strings.xml | 2 +- res/values-mcc234-pt-rPT/strings.xml | 2 +- res/values-mcc310-zu/strings.xml | 2 +- res/values-my/strings.xml | 2 +- res/values-or/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 @@ - "Isi-Spanish" + "Spanish" "Thola izexwayiso zesimo esiphuthumayo nge-Spanish uma kukhonakala" 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 @@ "အရေးပေါ်သတိပေးချက်များ" "အရေးပေါ်သတိပေးချက်များ" "အရေးပေါ်သတိပေးချက် အကြောင်းကြားချက်များကို လက်ခံသည်" - "အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် စာသားမှ စကားပြောသို့ကို အသုံးပြုသည်" + "အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် စာ-မှ-စကား ကို အသုံးပြုသည်" "လောလောဆယ်တွင် အရေးပေါ်သတိပေးချက်များကို ရရှိနေသည်။ အရေးပေါ်သတိပေးချက်များကို ဆက်လက်ရယူလိုပါသလား။" "အရေးပေါ်သတိပေးချက်များ" "အရေးပေါ်သတိပေးချက် ဆက်တင်များကို ကြည့်ရန် တို့ပါ" 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 @@ "Alertas de emergência" "Alertas de emergência" "Receba notificações de alertas de emergência." - "Utilize a síntese de voz para dizer mensagens de alerta de emergência." + "Utilize a conversão de texto em voz para dizer mensagens de alerta de emergência." "Atualmente, está a receber alertas de emergência. Pretende continuar a receber alertas de emergência?" "Alertas de emergência" "Toque para ver as definições dos alertas de emergência" 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 @@ - "Isi-Spanish" + "Spanish" "Thola izexwayiso zesimo esiphuthumayo nge-Spanish uma kukhonakala" "Susa lesi sexwayiso?" "Susa zonke izexwayiso ozitholile?" 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 @@ "ကြိုးမဲ့ အရေးပေါ် သတိပေးအကြောင်းကြားချက် လက်ခံရန်" "အရေးပေါ်သတိပေးချက်" "စကားပြော သတိပေးမက်ဆေ့ဂျ်" - "ကြိုးမဲ့ အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် \'စာသားမှ စကားပြောသို့\' ကိုအသုံးပြုပါ" + "ကြိုးမဲ့ အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် \'စာ-မှ-စကား\' ကိုအသုံးပြုပါ" "သတိပေးချက်အသံကို ပုံမှန်အကျယ်ဖြင့် ဖွင့်ပါမည်" "အရေးပေါ်သတိပေးချက် မှတ်တမ်း" "သတိပေးချက် ရွေးချယ်မှုများ" 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 @@ "ଏହି ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରିବେ?" "ପ୍ରାପ୍ତ କରିଥିବା ସମସ୍ତ ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌ ଡିଲିଟ୍‌ କରିବେ?" "ଡିଲିଟ୍‌ କରନ୍ତୁ" - "ବାତିଲ୍‍ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" "ଭୂମିକମ୍ପ ଚେତାବନୀ" "ସୁନାମି ଚେତାବନୀ" "ଭୂମିକମ୍ପ ଏବଂ ସୁନାମି ଚେତାବନୀ" 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 @@ "Receber notificações de alerta de emergência sem fios" "Lembrete de alerta" "Dizer mensagem de alerta" - "Utilize a síntese de voz para dizer mensagens de alertas de emergência sem fios." + "Utilize a conversão de texto em voz para dizer mensagens de alertas de emergência sem fios." "Será reproduzido um som de lembrete com o volume normal" "Histórico de alertas de emergência" "Preferências de alerta" -- cgit v1.2.3 From 6dec6c21722e18ca04c0e01d4640224a9de47a2a Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 11:02:50 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I85c2be10009879791e8429c9a06ac09873676b9c --- res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ "ଏହି ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରିବେ?" "ପ୍ରାପ୍ତ କରିଥିବା ସମସ୍ତ ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌ ଡିଲିଟ୍‌ କରିବେ?" "ଡିଲିଟ୍‌ କରନ୍ତୁ" - "ବାତିଲ୍‍ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" "ଭୂମିକମ୍ପ ଚେତାବନୀ" "ସୁନାମି ଚେତାବନୀ" "ଭୂମିକମ୍ପ ଏବଂ ସୁନାମି ଚେତାବନୀ" -- cgit v1.2.3 From 4e965c4b2c05df585d63337c031f6a7505eca538 Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Wed, 13 Jul 2022 17:24:03 +0000 Subject: [CellBroadcastApp] Bump up the targetSdkVersion to 33 We need to ensure that all the mainline modules are targetting the latest SDK version, hence bumping up the targetSdkVersion to the latest i.e 33. Going forward this would be done by default go/mainline-modules-target-sdk-version-fix. Bug: b/232712689 Test: m CellBroadcastApp --skip-soong-tests; aapt2 dump badging ./out/target/product/vsoc_x86_64/apex/com.android.cellbroadcast/priv-app/CellBroadcastApp@M_2022_07/CellBroadcastApp.apk| grep targetSdkVersion: Change-Id: I7b245691593baf10fb0282a5fba08be14e2ef2c1 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: [ -- cgit v1.2.3