Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca03f82 authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

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

parents c96f6162 07a4fa2b

services/core/java/com/android/server/wm/TaskOrganizerController.java

+1 −0
Original line number Diff line number Diff line
@@ -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();