Merge "Null-check mNavigationBar when returning its view." (75c68001) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4562,7 +4562,7 @@ public class StatusBar extends SystemUI implements DemoMode,

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

	public KeyguardBottomAreaView getKeyguardBottomAreaView() {		public KeyguardBottomAreaView getKeyguardBottomAreaView() {