summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2020-03-09 12:24:06 -0400
committer Beverly Tai <beverlyt@google.com> 2020-03-09 16:26:17 +0000
commit63c6c59163d8397e79a5d3ab364ad04c7eb84e5d (patch)
treed9c7f80de95030968073bfde7d9561f1c23e8473
parent7e863266aafc23321ab4dfbcebf5d244e145f0dc (diff)
Add null check for status bar transitions
Test: atest SystemUITests Bug: 150570478 Change-Id: I4c93a08ddcbe35a95b77012e2345bfa25167be1b
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java2
1 files changed, 1 insertions, 1 deletions
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);