commit e77705d24191bebb2dc27c83bbcc45bdc28d2f13
author Julia Tuttle <juliatuttle@google.com> Mon Mar 18 13:18:23 2024 -0400
committer Andrew Chant <achant@google.com> Tue Mar 19 19:30:04 2024 +0000
tree 966792d04df90ae535f04e0d81fbfcfbc7f2464b
parent 859be0cd4bb3a170794822af7b4fed23263b37c8

CallStyle: add missing null check for icon

Bug: 329288442
Flag: ACONFIG com.android.systemui.new_call_style_action_layout NEXTFOOD
Test: none
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bfc6a51b9b82708154b2353c38c4fce562fe023e)
Merged-In: I5d0773881171dd233411edc19d3988789dac4259
Change-Id: I5d0773881171dd233411edc19d3988789dac4259
(cherry picked from commit d33b0c370f308fa90bbf6f40adb2da17914faad9)

core/java/com/android/internal/widget/EmphasizedNotificationButton.java

diff --git a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
index 3e065bf..01b4569 100644
--- a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
+++ b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
@@ -171,7 +171,9 @@
             return;
         }
 
-        prepareIcon(icon);
+        if (icon != null) {
+            prepareIcon(icon);
+        }
 
         mIconToGlue = icon;
         mGluePending = true;