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

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

Merge "Protect against potential NPE" into main

parents 72978bf4 1b7f1538

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

+3 −2
Original line number Diff line number Diff line
@@ -2323,7 +2323,8 @@ public class BubbleStackView extends FrameLayout 
        updateOverflowVisibility();

        updatePointerPosition(false /* forIme */);

        mExpandedAnimationController.expandFromStack(() -> {

            if (mIsExpanded && mExpandedBubble.getExpandedView() != null) {

            if (mIsExpanded && mExpandedBubble != null

                    && mExpandedBubble.getExpandedView() != null) {

                maybeShowManageEdu();

            }

            updateOverflowDotVisibility(true /* expanding */);
@@ -2384,7 +2385,7 @@ public class BubbleStackView extends FrameLayout 
        }

        mExpandedViewContainer.setAnimationMatrix(mExpandedViewContainerMatrix);



        if (mExpandedBubble.getExpandedView() != null) {

        if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {

            mExpandedBubble.getExpandedView().setContentAlpha(0f);

            mExpandedBubble.getExpandedView().setBackgroundAlpha(0f);