From 408a91a193a2484dd3d3c7ec156788e95b752b48 Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Mon, 17 Oct 2022 15:18:10 -0700
Subject: [PATCH] Guard one more use of CentralSurfaces in NavBar

Also mark mPanelView in NavigationBarView nullable. All uses of it
already have null checks.

Bug: 254123249
Test: Barbet still looks OK.
Change-Id: I0b0c3017bd89f2d2261283573519301557096b2b
---
 .../src/com/android/systemui/navigationbar/NavigationBar.java | 4 +++-
 .../com/android/systemui/navigationbar/NavigationBarView.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
index 6da8c69c013b6..c089511a7ce91 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
@@ -679,7 +679,9 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
     public void onViewAttached() {
         final Display display = mView.getDisplay();
         mView.setComponents(mRecentsOptional);
-        mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController());
+        if (mCentralSurfacesOptionalLazy.get().isPresent()) {
+            mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController());
+        }
         mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);
         mView.setOnVerticalChangedListener(this::onVerticalChanged);
         mView.setOnTouchListener(this::onNavigationTouch);
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
index 97024881ca62c..403d276f8cbca 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
@@ -148,6 +148,7 @@ public class NavigationBarView extends FrameLayout {
 
     private NavigationBarInflaterView mNavigationInflaterView;
     private Optional<Recents> mRecentsOptional = Optional.empty();
+    @Nullable
     private NotificationPanelViewController mPanelView;
     private RotationContextButton mRotationContextButton;
     private FloatingRotationButton mFloatingRotationButton;