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

Commit a2433db0 authored by Joshua Tsuji's avatar Joshua Tsuji
Browse files

Fix NPE with disabled overflow. 

Test: atest SystemUITests
Fixes: 151345204
Change-Id: I470b28c74da39e966568712d15934db6a41615f7
parent bc7744b9

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

+6 −3
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ public class BubbleStackView extends FrameLayout { 


    private int mOrientation = Configuration.ORIENTATION_UNDEFINED;



    @Nullable

    private BubbleOverflow mBubbleOverflow;



    private boolean mShouldShowUserEducation;
@@ -1387,7 +1388,7 @@ public class BubbleStackView extends FrameLayout { 
            Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);

        }



        if (bubble.equals(mBubbleOverflow.getIconView())) {

        if (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView())) {

            return;

        }
@@ -1403,7 +1404,8 @@ public class BubbleStackView extends FrameLayout { 


    /** Called with the coordinates to which an individual bubble has been dragged. */

    public void onBubbleDragged(View bubble, float x, float y) {

        if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {

        if (!mIsExpanded || mIsExpansionAnimating

                || (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) {

            return;

        }
@@ -1418,7 +1420,8 @@ public class BubbleStackView extends FrameLayout { 
            Log.d(TAG, "onBubbleDragFinish: bubble=" + bubble);

        }



        if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {

        if (!mIsExpanded || mIsExpansionAnimating

                || (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) {

            return;

        }