Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d62eeb3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential crash in ImageTransformState" am: 4ab85d92 

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



Change-Id: Icd81f5101199db90cbe5c93baa5a45b6ee80b6e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a25279e2 4ab85d92

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }