commit 53ba97ecd560c03ac1d3421c09e1677729c92218
author Xin Li <delphij@google.com> Sat Oct 07 00:20:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 07 00:20:22 2023 +0000
tree 6c4a37b9fcf90666bd1d64b3e65de50c0e7388f2
parent 271e41c456c2a0666ac2e2febeaac9100a6c7a3f
parent a4d7e6299987f20538c845af20cae8180d3db3f2

[automerger skipped] Merge Android 14 am: 1881d6fab7 -s ours am: 2669dd4b7d -s ours am: dbea2ee25f -s ours am: 073dc761c1 -s ours am: a4d7e62999 -s ours

am skip reason: Merged-In I16919b379b64764ebc7a41bf150fd92260a2e5dc with SHA-1 c536726eec is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2777169

Change-Id: I0ba84565c71e0de997833105b4a236af538d124b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3f52171..0f68870 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,8 +22,8 @@
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.cl" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" android:maxSdkVersion="34"/>
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.cl" android:maxSdkVersion="34"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />

res/values-zh-rHK/strings.xml

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 7f5ff5b..5c7247c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -26,7 +26,7 @@
     <string name="provider_label" msgid="1910026788169486138">"日曆"</string>
     <string name="debug_tool_delete_button" msgid="2843837310185088850">"立即刪除"</string>
     <string name="debug_tool_start_button" msgid="2827965939935983665">"開始"</string>
-    <string name="debug_tool_message" msgid="2315979068524074618">"您即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string>
+    <string name="debug_tool_message" msgid="2315979068524074618">"你即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string>
     <string name="debug_tool_email_sender_picker" msgid="2527150861906694072">"選擇要用來傳送檔案的程式"</string>
     <string name="debug_tool_email_subject" msgid="1450453531950410260">"內含「日曆」資料庫附件"</string>
     <string name="debug_tool_email_body" msgid="1271714905048793618">"附上我的「日曆」資料庫，其中包含我所有的預約和個人資料，請謹慎處理。"</string>