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

Commit 1b7f1538 authored by Mady Mellor's avatar Mady Mellor
Browse files

Protect against potential NPE 

Test: treehugger
Bug: 316906000
Change-Id: Icbd14e1dd5f6a9eb6e397acd2fd956e74b41dcf0
parent 2996824c

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);