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 am: ab913b2ef3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I157a26809c514df5677a66993a51baa8d0f724fe
This commit is contained in:
Dave Mankoff
2021-01-29 18:30:43 +00:00
committed by Automerger Merge Worker
parent b2a2a0a123 ab913b2ef3
commit 6cea841f41
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;
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 */);
}