From 148852fb8d8a0d182b7918852c62d73a43d4855e Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Fri, 27 Sep 2024 14:16:08 +0000 Subject: 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 Change-Id: I193eaeba55abded5f4726976dc0839d44215726c --- java/src/com/android/intentresolver/ChooserActivity.java | 1 + 1 file changed, 1 insertion(+) (limited to 'java') 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, -- cgit v1.2.3-59-g8ed1b