From 63c6c59163d8397e79a5d3ab364ad04c7eb84e5d Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 9 Mar 2020 12:24:06 -0400
Subject: Add null check for status bar transitions

Test: atest SystemUITests
Bug: 150570478
Change-Id: I4c93a08ddcbe35a95b77012e2345bfa25167be1b
---
 .../SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 287ede48fa06..8fcbab515759 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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);
-- 
cgit v1.2.3-59-g8ed1b