Merge "Add a null check to prevent NPE when status bar isn't inflated" into udc-dev

2023-05-08 17:08:35 +00:00
parent 23cdcba71c ce8997fc0b
commit a59d1b8ed6
1 changed files with 5 additions and 2 deletions
--- 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();