summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java7
1 files changed, 5 insertions, 2 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 55498af7a54b..50e4f3d8f947 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -3842,7 +3842,9 @@ public class StatusBar extends SystemUI implements DemoMode,
}
public void onKeyguardOccludedChanged(boolean keyguardOccluded) {
- mNavigationBar.onKeyguardOccludedChanged(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 ------------------------------------