Merge "Avoid visibility change on navBar view if null" into rvc-dev am: 8694188f71 am: 0460b4c16d

Change-Id: I4264b02eaf5a4243f7ced076768644e08e37bde1
2020-04-07 01:31:20 +00:00
parent a8c1782565 0460b4c16d
commit 28fae013c6
1 changed files with 3 additions and 1 deletions
--- 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) {