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

Commit 1ad918f4 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "upgrade appdied transition trigger to task if relevant" into tm-qpr-dev am: 854d61eb 

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



Change-Id: Icfff8057ef1a3ea90a29df28af19bceb5e11dc70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0f9cd0f 854d61eb

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

+5 −1
Original line number Diff line number Diff line
@@ -4076,7 +4076,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            // to the restarted activity.

            nowVisible = mVisibleRequested;

        }

        mTransitionController.requestCloseTransitionIfNeeded(this);

        // upgrade transition trigger to task if this is the last activity since it means we are

        // closing the task.

        final WindowContainer trigger = remove && task != null && task.getChildCount() == 1

                ? task : this;

        mTransitionController.requestCloseTransitionIfNeeded(trigger);

        cleanUp(true /* cleanServices */, true /* setState */);

        if (remove) {

            if (mStartingData != null && mVisible && task != null) {