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

Change-Id: Ie08c86393aa0dcb47e42728f5992ee3d404e97d1
This commit is contained in:
Automerger Merge Worker
2020-03-09 20:49:53 +00:00

View File

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