DO NOT MERGE Add null check for status bar transitions

Test: atest SystemUITests
Bug: 150570478
Change-Id: I4c93a08ddcbe35a95b77012e2345bfa25167be1b
This commit is contained in:
Beverly
2020-03-09 12:24:06 -04:00
committed by Beverly Tai
parent 12c8c244a6
commit 447394f908

View File

@@ -2277,8 +2277,10 @@ public class StatusBar extends SystemUI implements DemoMode,
void checkBarModes() {
if (mDemoMode) return;
if (mStatusBarView != null) checkBarMode(mStatusBarMode, mStatusBarWindowState,
getStatusBarTransitions());
if (mStatusBarView != null && getStatusBarTransitions() != null) {
checkBarMode(mStatusBarMode, mStatusBarWindowState,
getStatusBarTransitions());
}
mNavigationBarController.checkNavBarModes(mDisplayId);
mNoAnimationOnNextBarModeChange = false;
}