From 07a4fa2beba688082a0e12a4e9eab8722b4dc9ff Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Fri, 14 Apr 2023 15:19:53 -0700
Subject: [PATCH] Check the nullity of display when remove starting window

Bug: 278268592
Test: ABTD run.
Change-Id: I7313957e6f266d1b55173f109286e75037495109
---
 .../core/java/com/android/server/wm/TaskOrganizerController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java
index 184293e110027..5626aa7f075f4 100644
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -681,6 +681,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
         final StartingWindowRemovalInfo removalInfo = new StartingWindowRemovalInfo();
         removalInfo.taskId = task.mTaskId;
         removalInfo.playRevealAnimation = prepareAnimation
+                && task.getDisplayContent() != null
                 && task.getDisplayInfo().state == Display.STATE_ON;
         final boolean playShiftUpAnimation = !task.inMultiWindowMode();
         final ActivityRecord topActivity = task.topActivityContainsStartingWindow();