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

Commit 69cfb735 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

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

Merge "Check the nullity of display when remove starting window" into udc-dev am: aca03f82 am: 843459f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22679890



Change-Id: I09b97593299713b4f093e3ea0e56c7ebba26a29e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffe169fd 843459f4

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