summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-11-21 15:10:04 -0800
committer Xin Li <delphij@google.com> 2024-11-21 15:10:04 -0800
commitc7740a8aca47016b3714c48dd27b8abf6e4c9223 (patch)
tree42991edf02563424f8f2a50a6beebd27ec3a921f /java/src
parentfca7f4058678568daa0e95f8fdf97ea69d887c7a (diff)
parent8691ff54748827165a9502e09e4512fbe5f6bf39 (diff)
Merge ab/AP4A.240925.013 into aosp-main-future
Bug: 370570306 Merged-In: I2bbd3a8af75113c62074fbb92be7fc929e497d2d Change-Id: I359423c121685fc91df0f4b34d86c9ea85274533
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,