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

Merge "Add null check for status bar transitions" into rvc-dev am: a8664f8e02 am: c3f4105576

Browse Source 
Change-Id: I75a986011a1f0f66273b47ba1885f3553e4073a3
This commit is contained in:
Automerger Merge Worker
2020-03-09 20:36:39 +00:00
parent f4bd180848 c3f4105576
commit 4fc9ed94bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2333,7 +2333,7 @@ public class StatusBar extends SystemUI implements DemoMode,
void checkBarModes() { void checkBarModes() {
if (mDemoMode) return; if (mDemoMode) return;
if (mNotificationShadeWindowViewController != null) { if (mNotificationShadeWindowViewController != null && getStatusBarTransitions() != null) {
checkBarMode(mStatusBarMode, mStatusBarWindowState, getStatusBarTransitions()); checkBarMode(mStatusBarMode, mStatusBarWindowState, getStatusBarTransitions());
} }
mNavigationBarController.checkNavBarModes(mDisplayId); mNavigationBarController.checkNavBarModes(mDisplayId);