summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Joshua Trask <joshtrask@google.com> 2024-09-27 14:16:08 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-10-04 22:53:47 +0000
commit86608fc6b4bcf2b594d3ba054d758656b29d2538 (patch)
treedd09660f17fd8356ca7f1f7164ec2d872fea9beb /java/src
parent703a9c9d995a2477477124cb5bcec8224e08453e (diff)
Add other null check in decorateActionFactoryWithRefinement
The nullability for `getEditButtonRunnable()` was addressed in ag/28555982 but a similar fix is still needed for the copy button. Bug: 353397828 Flag: EXEMPT bugfix Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:148852fb8d8a0d182b7918852c62d73a43d4855e) Merged-In: I193eaeba55abded5f4726976dc0839d44215726c Change-Id: I193eaeba55abded5f4726976dc0839d44215726c
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,