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

Commit 93132948 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE" into rvc-dev am: 4c94835d am: c0b94305 

Change-Id: I293c8060d5e6381fde8d2d2fd734f0a4cf943d99
parents 9c88460e c0b94305

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

+1 −1
Original line number Diff line number Diff line
@@ -1441,7 +1441,7 @@ public class BubbleStackView extends FrameLayout { 


    /** Expands the clicked bubble. */

    public void expandBubble(Bubble bubble) {

        if (bubble.equals(mBubbleData.getSelectedBubble())) {

        if (bubble != null && bubble.equals(mBubbleData.getSelectedBubble())) {

            // If the bubble we're supposed to expand is the selected bubble, that means the

            // overflow bubble is currently expanded. Don't tell BubbleData to set this bubble as

            // selected, since it already is. Just call the stack's setSelectedBubble to expand it.