From 12d34169d65a07a99fb29e2332f7f01d256de202 Mon Sep 17 00:00:00 2001
From: Alan Chen <alanschen@google.com>
Date: Tue, 30 Jul 2024 14:15:19 -0700
Subject: 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
---
 java/src/com/android/intentresolver/ChooserActivity.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java/src')

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,
-- 
cgit v1.2.3-59-g8ed1b