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

Commit dabe857e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Allow to pause finishing transient launch" into main

parents 4a903b89 4c3ccd9a

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

+2 −1
Original line number Diff line number Diff line
@@ -1910,7 +1910,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        if (!hasDirectChildActivities()) {

            return false;

        }

        if (mResumedActivity != null && mTransitionController.isTransientLaunch(mResumedActivity)) {

        if (mResumedActivity != null && !mResumedActivity.finishing

                && mTransitionController.isTransientLaunch(mResumedActivity)) {

            // Even if the transient activity is occluded, defer pausing (addToStopping will still

            // be called) it until the transient transition is done. So the current resuming

            // activity won't need to wait for additional pause complete.