diff options
| author | 2023-01-10 16:45:45 +0000 | |
|---|---|---|
| committer | 2023-01-10 16:45:45 +0000 | |
| commit | d62eeb3ee7cc61b29445dfd4020851ca80f095d1 (patch) | |
| tree | 1e6c8bf59dd92bb58d06997e836741fed16d452b | |
| parent | a25279e2622cdaf6c193746e1a793e1de8822498 (diff) | |
| parent | 4ab85d92e956419a80507794b733de247db56e76 (diff) | |
Merge "Fix potential crash in ImageTransformState" am: 4ab85d92e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2375267
Change-Id: Icd81f5101199db90cbe5c93baa5a45b6ee80b6e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 76025ab7aa7d..0446165be5fc 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; } |