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

Commit 0122cc90 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix crash when opening bubble overflow 

BubbleExpandedView needs a BubbleStackView reference, without that
there could be an NPE in various locations.

Also uses the correct parent view to setup the overflow.

Test: manual - tap on the overflow, observe no crash
Fixes: 150394526
Change-Id: Ib1ae9353a0dfd60ac8b6eb4f94b5b0cc5bc47811
parent 5b55f124

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

+2 −1
Original line number Diff line number Diff line
@@ -62,11 +62,12 @@ public class BubbleOverflow implements BubbleViewProvider { 
                R.dimen.bubble_overflow_icon_bitmap_size);

    }



    public void setUpOverflow(ViewGroup parentViewGroup) {

    void setUpOverflow(ViewGroup parentViewGroup, BubbleStackView stackView) {

        mOverflowExpandedView = (BubbleExpandedView) mInflater.inflate(

                R.layout.bubble_expanded_view, parentViewGroup /* root */,

                false /* attachToRoot */);

        mOverflowExpandedView.setOverflow(true);

        mOverflowExpandedView.setStackView(stackView);



        updateIcon(mContext, parentViewGroup);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -522,8 +522,8 @@ public class BubbleStackView extends FrameLayout { 
    private void setUpOverflow() {

        int overflowBtnIndex = 0;

        if (mBubbleOverflow == null) {

            mBubbleOverflow = new BubbleOverflow(mContext);

            mBubbleOverflow.setUpOverflow(this);

            mBubbleOverflow = new BubbleOverflow(getContext());

            mBubbleOverflow.setUpOverflow(mBubbleContainer, this);

        } else {

            mBubbleContainer.removeView(mBubbleOverflow.getBtn());

            mBubbleOverflow.updateIcon(mContext, this);