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

Commit 1cd139fa authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix NPE in StatusBar 

StatusBar was trying to call a method on the StatusBarView before
the view had been set. There was actually a null check in part of
the corrected method already. This extends the null check.

Fixes: 176216370
Test: manual
Change-Id: I7c576d1018f15557fd787dc74897ed6946b38076
parent 8f046c76

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

            }