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

Commit 6e8b3652 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix a potential NPE" into main

parents 9b08963c 8e067cad

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+2 −2
Original line number Diff line number Diff line
@@ -537,8 +537,8 @@ public class BubbleStackView extends FrameLayout 
                return;

            }



            final boolean clickedBubbleIsCurrentlyExpandedBubble =

                    clickedBubble.getKey().equals(mExpandedBubble.getKey());

            final boolean clickedBubbleIsCurrentlyExpandedBubble = mExpandedBubble != null

                            && clickedBubble.getKey().equals(mExpandedBubble.getKey());



            if (isExpanded()) {

                mExpandedAnimationController.onGestureFinished();