Merge "Add null check for status bar transitions" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-09 19:36:45 +00:00
committed by Android (Google) Code Review

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);