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

Commit 97002b2c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't NPE in PanelView"

parents 5f243756 0de26b05

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+5 −3
Original line number Diff line number Diff line
@@ -1172,9 +1172,11 @@ public abstract class PanelView extends FrameLayout { 
    }



    protected void notifyBarPanelExpansionChanged() {

        if (mBar != null) {

            mBar.panelExpansionChanged(mExpandedFraction, mExpandedFraction > 0f

                || mPeekAnimator != null || mInstantExpanding || isPanelVisibleBecauseOfHeadsUp()

                || mTracking || mHeightAnimator != null);

                    || mPeekAnimator != null || mInstantExpanding

                    || isPanelVisibleBecauseOfHeadsUp() || mTracking || mHeightAnimator != null);

        }

        if (mExpansionListener != null) {

            mExpansionListener.accept(mExpandedFraction, mTracking);

        }