Merge "Add null check for status bar transitions" into rvc-dev am: a8664f8e02... (4e4ea8f8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);