Merge ab/AP4A.240925.013 into aosp-main-future

Bug: 370570306
Merged-In: I2bbd3a8af75113c62074fbb92be7fc929e497d2d
Change-Id: I359423c121685fc91df0f4b34d86c9ea85274533

7 files changed, 7 insertions, 6 deletions

diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index 88faf86c..49769c57 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -76,7 +76,7 @@
     <string name="file_preview_a11y_description" msgid="7397224827802410602">"صورة مصغّرة لمعاينة ملف"</string>
     <string name="chooser_no_direct_share_targets" msgid="4233416657754261844">"ما مِن أشخاص مقترحين للمشاركة معهم"</string>
     <string name="usb_device_resolve_prompt_warn" msgid="4254493957548169620">"‏لم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا."</string>
-    <string name="resolver_personal_tab" msgid="1381052735324320565">"مساحة شخصية"</string>
+    <string name="resolver_personal_tab" msgid="1381052735324320565">"المساحة الشخصية"</string>
     <string name="resolver_work_tab" msgid="3588325717455216412">"مساحة العمل"</string>
     <string name="resolver_private_tab" msgid="3707548826254095157">"المساحة الخاصّة"</string>
     <string name="resolver_personal_tab_accessibility" msgid="4467784352232582574">"عرض المحتوى الشخصي"</string>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index 0cc9b219..3f6db1be 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -76,7 +76,7 @@
     <string name="file_preview_a11y_description" msgid="7397224827802410602">"फ़ाइल के थंबनेल की झलक"</string>
     <string name="chooser_no_direct_share_targets" msgid="4233416657754261844">"शेयर करने के लिए, किसी व्यक्ति का सुझाव नहीं दिया गया है"</string>
     <string name="usb_device_resolve_prompt_warn" msgid="4254493957548169620">"इस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऐसा कर सकता है."</string>
-    <string name="resolver_personal_tab" msgid="1381052735324320565">"निजी प्रोफ़ाइल"</string>
+    <string name="resolver_personal_tab" msgid="1381052735324320565">"निजी"</string>
     <string name="resolver_work_tab" msgid="3588325717455216412">"वर्क प्रोफ़ाइल"</string>
     <string name="resolver_private_tab" msgid="3707548826254095157">"प्राइवेट"</string>
     <string name="resolver_personal_tab_accessibility" msgid="4467784352232582574">"निजी व्यू"</string>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index e7521e77..bed01ff0 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -78,7 +78,7 @@
     <string name="usb_device_resolve_prompt_warn" msgid="4254493957548169620">"‏לאפליקציה זו לא ניתנה הרשאת הקלטה, אבל אפשר להקליט אודיו באמצעות התקן ה-USB הזה."</string>
     <string name="resolver_personal_tab" msgid="1381052735324320565">"אישי"</string>
     <string name="resolver_work_tab" msgid="3588325717455216412">"עבודה"</string>
-    <string name="resolver_private_tab" msgid="3707548826254095157">"פרטי"</string>
+    <string name="resolver_private_tab" msgid="3707548826254095157">"מרחב פרטי"</string>
     <string name="resolver_personal_tab_accessibility" msgid="4467784352232582574">"תצוגה אישית"</string>
     <string name="resolver_work_tab_accessibility" msgid="7581878836587799920">"תצוגת עבודה"</string>
     <string name="resolver_private_tab_accessibility" msgid="2513122834337197252">"תצוגה פרטית"</string>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index a21af078..d48cc781 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -76,7 +76,7 @@
     <string name="file_preview_a11y_description" msgid="7397224827802410602">"Miniatyr av förhandsgranskning av fil"</string>
     <string name="chooser_no_direct_share_targets" msgid="4233416657754261844">"Inga rekommenderade personer att dela med"</string>
     <string name="usb_device_resolve_prompt_warn" msgid="4254493957548169620">"Appen har inte fått inspelningsbehörighet men kan spela in ljud via denna USB-enhet."</string>
-    <string name="resolver_personal_tab" msgid="1381052735324320565">"Privat"</string>
+    <string name="resolver_personal_tab" msgid="1381052735324320565">"Personlig"</string>
     <string name="resolver_work_tab" msgid="3588325717455216412">"Jobb"</string>
     <string name="resolver_private_tab" msgid="3707548826254095157">"Privat"</string>
     <string name="resolver_personal_tab_accessibility" msgid="4467784352232582574">"Personlig vy"</string>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index eb789f5e..4c84256e 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -89,7 +89,7 @@
     <string name="resolver_cant_access_personal_apps_explanation" msgid="6209543716289792706">"Bạn không thể mở nội dung này bằng ứng dụng cá nhân"</string>
     <string name="resolver_cant_share_with_private_apps_explanation" msgid="1781980997411434697">"Không chia sẻ được nội dung này bằng ứng dụng riêng tư"</string>
     <string name="resolver_cant_access_private_apps_explanation" msgid="5978609934961648342">"Không mở được nội dung này bằng ứng dụng riêng tư"</string>
-    <string name="resolver_turn_on_work_apps" msgid="7115260573975624516">"Các ứng dụng công việc đã bị tạm dừng"</string>
+    <string name="resolver_turn_on_work_apps" msgid="7115260573975624516">"Các ứng dụng trong hồ sơ Công việc đã bị tạm dừng"</string>
     <string name="resolver_switch_on_work" msgid="8678893259344318807">"Tiếp tục"</string>
     <string name="resolver_no_work_apps_available" msgid="6139818641313189903">"Không có ứng dụng công việc"</string>
     <string name="resolver_no_personal_apps_available" msgid="8479033344701050767">"Không có ứng dụng cá nhân"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index a2401ce7..c2fa444f 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -67,7 +67,7 @@
     <string name="sharing_videos_with_link" msgid="6383290441403042321">"{count,plural, =1{正在分享带有链接的视频}other{正在分享带有链接的 # 个视频}}"</string>
     <string name="sharing_files_with_text" msgid="7331187260405018080">"{count,plural, =1{正在分享带有文本的文件}other{正在分享带有文本的 # 个文件}}"</string>
     <string name="sharing_files_with_link" msgid="6052797122358827239">"{count,plural, =1{正在分享带有链接的文件}other{正在分享带有链接的 # 个文件}}"</string>
-    <string name="sharing_album" msgid="191743129899503345">"分享影集"</string>
+    <string name="sharing_album" msgid="191743129899503345">"分享相册"</string>
     <string name="sharing_images_only" msgid="7762589767189955438">"{count,plural, =1{仅限图片}other{仅限图片}}"</string>
     <string name="sharing_videos_only" msgid="5549729252364968606">"{count,plural, =1{仅限视频}other{仅限视频}}"</string>
     <string name="sharing_files_only" msgid="6603666533766964768">"{count,plural, =1{仅限文件}other{仅限文件}}"</string>
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 3db821c1..4fc8fd9d 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -2174,6 +2174,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
             @Override
             @Nullable
             public Runnable getCopyButtonRunnable() {
+                if (originalFactory.getCopyButtonRunnable() == null) return null;
                 return () -> {
                     if (!mRefinementManager.maybeHandleSelection(
                             RefinementType.COPY_ACTION,