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

Commit 6cea841f authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in StatusBar" into sc-dev am: ab913b2e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I157a26809c514df5677a66993a51baa8d0f724fe
parents b2a2a0a1 ab913b2e

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 */);

            }