From ccaeb5a4702563c2267fb14c732d80470225deb2 Mon Sep 17 00:00:00 2001
From: Shen Lin <shhenlin@gmail.com>
Date: Fri, 6 Jan 2023 23:06:59 +0800
Subject: [PATCH] Fix potential crash in ImageTransformState

android.graphics.drawable.Icon#sameAs() requires a non-null icon object
to do compare.

Bug: 264608650
Test: Manual
Change-Id: I0625ebce8c368d621e40be0162a023427a911083
---
 .../systemui/statusbar/notification/ImageTransformState.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java
index 76025ab7aa7d0..0446165be5fcb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java
@@ -53,7 +53,9 @@ public class ImageTransformState extends TransformState {
             return true;
         }
         if (otherState instanceof ImageTransformState) {
-            return mIcon != null && mIcon.sameAs(((ImageTransformState) otherState).getIcon());
+            final Icon otherIcon = ((ImageTransformState) otherState).mIcon;
+            return mIcon == otherIcon || (mIcon != null && otherIcon != null && mIcon.sameAs(
+                    otherIcon));
         }
         return false;
     }