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

Change-Id: I22248d0eb884323a2f072b773adb85d476dbb1ad
This commit is contained in:
Automerger Merge Worker
2020-03-09 22:05:23 +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);