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

Commit b66b14e4 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE" into rvc-qpr-dev am: 2760473c am: efc36ab4 

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

Change-Id: I5f832064eb9ce979f82ed9ebbd0129a690abe3a6
parents 56f9ce0e efc36ab4

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+9 −3
Original line number Diff line number Diff line
@@ -1586,6 +1586,11 @@ public class BubbleStackView extends FrameLayout 
            Log.d(TAG, "setSelectedBubble: " + bubbleToSelect);

        }



        if (bubbleToSelect == null) {

            mBubbleData.setShowingOverflow(false);

            return;

        }



        // Ignore this new bubble only if it is the exact same bubble object. Otherwise, we'll want

        // to re-render it even if it has the same key (equals() returns true). If the currently

        // expanded bubble is removed and instantly re-added, we'll get back a new Bubble instance
@@ -1594,10 +1599,11 @@ public class BubbleStackView extends FrameLayout 
        if (mExpandedBubble == bubbleToSelect) {

            return;

        }

        if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) {

            mBubbleData.setShowingOverflow(false);

        } else {



        if (bubbleToSelect.getKey() == BubbleOverflow.KEY) {

            mBubbleData.setShowingOverflow(true);

        } else {

            mBubbleData.setShowingOverflow(false);

        }



        if (mIsExpanded && mIsExpansionAnimating) {