Merge "Check the nullity of display when remove starting window" into udc-dev

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();