Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in StatusBar" into sc-dev

Browse Source
This commit is contained in:
Dave Mankoff
2021-01-29 18:23:03 +00:00
committed by Android (Google) Code Review
parent 63d515d10e 1cd139faec
commit ab913b2ef3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2331,11 +2331,11 @@ public class StatusBar extends SystemUI implements DemoMode,
&& mStatusBarWindowState != state) { && mStatusBarWindowState != state) {
mStatusBarWindowState = state; mStatusBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(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 (mStatusBarView != null) {
if (!showing && mState == StatusBarState.SHADE) {
mStatusBarView.collapsePanel(false /* animate */, false /* delayed */,
1.0f /* speedUpFactor */);
}
mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN; mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;
updateHideIconsForBouncer(false /* animate */); updateHideIconsForBouncer(false /* animate */);
} }