From ce8997fc0bec755f4d01c11f913fe4913a9d9c08 Mon Sep 17 00:00:00 2001
From: Shawn Lee <syeonlee@google.com>
Date: Fri, 5 May 2023 14:31:37 -0700
Subject: [PATCH] Add a null check to prevent NPE when status bar isn't
 inflated

It looks like occasionally touches are being handled as if they're
being proxied from status bar to shade before status bar view is
inflated, causing an NPE here.

Bug: 280086782
Test: N/A
Change-Id: I4b02287d7af013ab5358584d89e7eeac31f1e7f5
---
 .../com/android/systemui/recents/OverviewProxyService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
index a43f52019219c..07259c2ff2833 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
@@ -205,8 +205,11 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
                 // TODO move this logic to message queue
                 mCentralSurfacesOptionalLazy.get().ifPresent(centralSurfaces -> {
                     if (event.getActionMasked() == ACTION_DOWN) {
-                        centralSurfaces.getShadeViewController()
-                                        .startExpandLatencyTracking();
+                        ShadeViewController shadeViewController =
+                                centralSurfaces.getShadeViewController();
+                        if (shadeViewController != null) {
+                            shadeViewController.startExpandLatencyTracking();
+                        }
                     }
                     mHandler.post(() -> {
                         int action = event.getActionMasked();