Merge "Fix random systemui crashes during boot" (8078996f) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -3842,8 +3842,10 @@ public class StatusBar extends SystemUI implements DemoMode,
		}

		public void onKeyguardOccludedChanged(boolean keyguardOccluded) {
		if (mNavigationBar != null) {
		mNavigationBar.onKeyguardOccludedChanged(keyguardOccluded);
		}
		}

		// State logging

		@@ -4633,7 +4635,8 @@ public class StatusBar extends SystemUI implements DemoMode,

		// TODO: Figure out way to remove this.
		public NavigationBarView getNavigationBarView() {
		return (NavigationBarView) mNavigationBar.getView();
		return (mNavigationBar != null) ?
		(NavigationBarView) mNavigationBar.getView() : null;
		}

		// ---------------------- DragDownHelper.OnDragDownListener ------------------------------------