summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinit Nayak <peanutbutter@google.com> 2020-04-06 15:36:58 -0700
committer Vinit Nayak <peanutbutter@google.com> 2020-04-06 15:36:58 -0700
commitd19ef551b5d7336c850e7c56425e174443b77c14 (patch)
tree8be78be6038667c38b87a09afd3413c054bc312e
parent50c80277ced2389abe416623b1edbc2ef599c19c (diff)
Avoid visibility change on navBar view if null
Nav bar view could not be instantiated when changing navigation modes or when NavigationModeController notifies of action OVERLAY_CHANGED via its broadcast receiver. Fixes: 153275085 Change-Id: I76b96aaded82f3172dad101eb897b286935e448e
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
index dc1db50549a8..3105155f28e8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
@@ -625,7 +625,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
// mOrientedHandle is initialized lazily
mOrientationHandle.setVisibility(View.GONE);
}
- mNavigationBarView.setVisibility(View.VISIBLE);
+ if (mNavigationBarView != null) {
+ mNavigationBarView.setVisibility(View.VISIBLE);
+ }
}
private int deltaRotation(int oldRotation, int newRotation) {