From 023e5da3c42eef9ed6f7cf7f0dcfa8099c5bf677 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Wed, 17 Jun 2020 11:35:01 -0400
Subject: [PATCH] Add Null checks to NavigationBarView

An apparent race condition means that the NavigationBarView tries to
use the NotificationPanelViewController before the StatusBar has
had an opportunity to create it.

Fixes: 156242260
Test: atest SystemUITests
Change-Id: I588fca9eeb3121cab30d714b1c1a55397d2f0da5
---
 .../com/android/systemui/statusbar/phone/NavigationBarView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 4821d8c46ed44..e83b159c4911a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -822,7 +822,7 @@ public class NavigationBarView extends FrameLayout implements
      */
     public void updateSlippery() {
         setSlippery(!isQuickStepSwipeUpEnabled() ||
-                (mPanelView.isFullyExpanded() && !mPanelView.isCollapsing()));
+                (mPanelView != null && mPanelView.isFullyExpanded() && !mPanelView.isCollapsing()));
     }
 
     private void setSlippery(boolean slippery) {