summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Alan Chen <alanschen@google.com> 2024-07-30 14:15:19 -0700
committer Alan Chen <alanschen@google.com> 2024-07-30 14:33:16 -0700
commit12d34169d65a07a99fb29e2332f7f01d256de202 (patch)
tree459f702ce1d77e35baacebcbb6bd96ce2ff16ced /java
parent07ab7e3322ed6b3e894995660fbbf29e5db88854 (diff)
Add a null check in decorateActionFactoryWithRefinement
Since originalFactory.getEditButtonRunnable is nullable, a check needs to be added to avoid an NPE. Bug: 353397828 Flag: EXEMPT bugfix Test: manual Change-Id: I9f028e30e7f6232fcd9c2cd3df423715c81e806b
Diffstat (limited to 'java')
-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 84f29e21..bc8788ad 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -2116,6 +2116,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
@Override
@Nullable
public Runnable getEditButtonRunnable() {
+ if (originalFactory.getEditButtonRunnable() == null) return null;
return () -> {
if (!mRefinementManager.maybeHandleSelection(
RefinementType.EDIT_ACTION,