summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-10-04 23:05:46 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-10-04 23:05:46 +0000
commit8691ff54748827165a9502e09e4512fbe5f6bf39 (patch)
tree78a3331c3bfc6ae15be23e7a5b810894aa3b2f8b /java/src
parent703a9c9d995a2477477124cb5bcec8224e08453e (diff)
parenta3ba3d88d2872f8412e816f13920225c5c9fd182 (diff)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29607884', 'googleplex-android-review.googlesource.com/29663148'] into 24Q4-release.
Change-Id: I4634acad06426619e1069b827c862912b4099795
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/ChooserActivity.java1
1 files changed, 1 insertions, 0 deletions
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,