Merge "DO NOT MERGE Add null check for status bar transitions" into qt-qpr1-dev

2020-03-10 21:20:23 +00:00
parent dca2204ab5 447394f908
commit 548c3bae81
1 changed files with 4 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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;
    }