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

Commit 843459f4 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 am: aca03f82 

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



Change-Id: Ib7430202269460d26f3aceaf998ba43f9d5ea5a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fea9c577 aca03f82

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