commit 857e1d84f275810c1130129eb2f00df925593507
author Julia Tuttle <juliatuttle@google.com> Mon Mar 18 17:41:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 18 17:41:26 2024 +0000
tree bab1578c081a2de67cc28c26225b16a8a705fc5f
parent 2b8d5db1c8b048cdcf6ca72ae3f3e212a0db356c
parent bfc6a51b9b82708154b2353c38c4fce562fe023e

Merge "CallStyle: add missing null check for icon" into main

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;