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

Commit ab913b2e authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in StatusBar" into sc-dev

parents 63d515d1 1cd139fa

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

+4 −4
Original line number Diff line number Diff line
@@ -2331,11 +2331,11 @@ public class StatusBar extends SystemUI implements DemoMode, 
                && mStatusBarWindowState != state) {

            mStatusBarWindowState = state;

            if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));

            if (mStatusBarView != null) {

                if (!showing && mState == StatusBarState.SHADE) {

                    mStatusBarView.collapsePanel(false /* animate */, false /* delayed */,

                            1.0f /* speedUpFactor */);

                }

            if (mStatusBarView != null) {

                mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;

                updateHideIconsForBouncer(false /* animate */);

            }