From d19ef551b5d7336c850e7c56425e174443b77c14 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 6 Apr 2020 15:36:58 -0700
Subject: [PATCH] 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
---
 .../systemui/statusbar/phone/NavigationBarFragment.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 dc1db50549a8b..3105155f28e88 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) {