From 19392fc5cfb0ef401911ba1c8fd41eb4592813fd Mon Sep 17 00:00:00 2001
From: Will Osborn <willosborn@google.com>
Date: Thu, 8 May 2025 12:39:20 +0000
Subject: [PATCH] Check for null display in DisplayController onDisplayAdded

Bug: 415007177
Test: local + presubmit
Flag: EXEMPT bugfix
Change-Id: Ic4e9e6156ed565ed86aa25ebbdeda853fb2d8eda
---
 src/com/android/launcher3/util/DisplayController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index bb9d89251a..bebcffb4e3 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -168,7 +168,10 @@ public class DisplayController implements DesktopVisibilityListener {
                     new DisplayManager.DisplayListener() {
                         @Override
                         public void onDisplayAdded(int displayId) {
-                            getOrCreatePerDisplayInfo(displayManager.getDisplay(displayId));
+                            Display display = displayManager.getDisplay(displayId);
+                            if (display != null) {
+                                getOrCreatePerDisplayInfo(display);
+                            }
                         }
 
                         @Override