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

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

Merge "Only set ready early in AR.finish if it is a self-contained op" into... 

Merge "Only set ready early in AR.finish if it is a self-contained op" into udc-dev am: e29879cb am: 1a1dc229

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



Change-Id: I96edd8e15db4ad9fa6152ed3933bfd1b4ca0edb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96b8d7d1 1a1dc229

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

+12 −2
Original line number Diff line number Diff line
@@ -3522,6 +3522,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


            final boolean endTask = task.getTopNonFinishingActivity() == null

                    && !task.isClearingToReuseTask();

            final Transition newTransition =

                    mTransitionController.requestCloseTransitionIfNeeded(endTask ? task : this);

            if (isState(RESUMED)) {

                if (endTask) {
@@ -3576,8 +3577,17 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            } else if (!isState(PAUSING)) {

                if (mVisibleRequested) {

                    // Prepare and execute close transition.

                    if (mTransitionController.isShellTransitionsEnabled()) {

                        setVisibility(false);

                        if (newTransition != null) {

                            // This is a transition specifically for this close operation, so set

                            // ready now.

                            newTransition.setReady(mDisplayContent, true);

                        }

                    } else {

                        prepareActivityHideTransitionAnimation();

                    }

                }



                final boolean removedActivity = completeFinishing("finishIfPossible") == null;

                // Performance optimization - only invoke OOM adjustment if the state changed to

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

+9 −4
Original line number Diff line number Diff line
@@ -577,12 +577,16 @@ class TransitionController { 
        return transition;

    }



    /** Requests transition for a window container which will be removed or invisible. */

    void requestCloseTransitionIfNeeded(@NonNull WindowContainer<?> wc) {

        if (mTransitionPlayer == null) return;

    /**

     * Requests transition for a window container which will be removed or invisible.

     * @return the new transition if it was created for this request, `null` otherwise.

     */

    Transition requestCloseTransitionIfNeeded(@NonNull WindowContainer<?> wc) {

        if (mTransitionPlayer == null) return null;

        Transition out = null;

        if (wc.isVisibleRequested()) {

            if (!isCollecting()) {

                requestStartTransition(createTransition(TRANSIT_CLOSE, 0 /* flags */),

                out = requestStartTransition(createTransition(TRANSIT_CLOSE, 0 /* flags */),

                        wc.asTask(), null /* remoteTransition */, null /* displayChange */);

            }

            collectExistenceChange(wc);
@@ -591,6 +595,7 @@ class TransitionController { 
            // collecting, this should be a member just in case.

            collect(wc);

        }

        return out;

    }



    /** @see Transition#collect */