Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential crash in ImageTransformState" am: 4ab85d92e9 am: d62eeb3ee7 am: 9a6922eee1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2375267

Change-Id: I8be5d0c46ec4100bc88702d64d576bbe2f88a39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-10 17:45:10 +00:00
committed by Automerger Merge Worker
parent 5eb2d3d0ea 9a6922eee1
commit eca628a7d0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageTransformState.java
View File

@@ -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;
}