diff options
author | 2021-01-29 18:23:03 +0000 | |
---|---|---|
committer | 2021-01-29 18:23:03 +0000 | |
commit | ab913b2ef30f74e1be1a901cd16228d5dbea0c29 (patch) | |
tree | 97ccf11919d6c4720a931c428f7fceebbe974970 | |
parent | 63d515d10e55fc6b87a7c1192b230d6592e2e3c6 (diff) | |
parent | 1cd139faec6828dff7abd27e88f2fdc86c9ed6a4 (diff) |
Merge "Fix NPE in StatusBar" into sc-dev
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index d4a2b4157338..b20c45780183 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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 (!showing && mState == StatusBarState.SHADE) { - mStatusBarView.collapsePanel(false /* animate */, false /* delayed */, - 1.0f /* speedUpFactor */); - } if (mStatusBarView != null) { + if (!showing && mState == StatusBarState.SHADE) { + mStatusBarView.collapsePanel(false /* animate */, false /* delayed */, + 1.0f /* speedUpFactor */); + } mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN; updateHideIconsForBouncer(false /* animate */); } |