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

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

Merge "Don't apply transactions of abort out-of-order." into udc-dev am:... 

Merge "Don't apply transactions of abort out-of-order." into udc-dev am: bb726e9c am: a094ab21 am: ddd7c2ab

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



Change-Id: I81fef0a7ab7cc1f8eab19e09c3e0dd235a7ec179
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4617c886 ddd7c2ab

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -813,6 +813,9 @@ public class Transitions implements RemoteCallable<Transitions>, 
            track.mReadyTransitions.remove(0);

            track.mReadyTransitions.remove(0);

            track.mActiveTransition = ready;

            track.mActiveTransition = ready;

            if (ready.mAborted) {

            if (ready.mAborted) {

                if (ready.mStartT != null) {

                    ready.mStartT.apply();

                }

                // finish now since there's nothing to animate. Calls back into processReadyQueue

                // finish now since there's nothing to animate. Calls back into processReadyQueue

                onFinish(ready, null, null);

                onFinish(ready, null, null);

                return;

                return;
@@ -940,10 +943,6 @@ public class Transitions implements RemoteCallable<Transitions>, 
    /** Aborts a transition. This will still queue it up to maintain order. */

    /** Aborts a transition. This will still queue it up to maintain order. */

    private void onAbort(ActiveTransition transition) {

    private void onAbort(ActiveTransition transition) {

        final Track track = mTracks.get(transition.getTrack());

        final Track track = mTracks.get(transition.getTrack());

        // apply immediately since they may be "parallel" operations: We currently we use abort for

        // thing which are independent to other transitions (like starting-window transfer).

        transition.mStartT.apply();

        transition.mFinishT.apply();

        transition.mAborted = true;

        transition.mAborted = true;





        mTracer.logAborted(transition.mInfo.getDebugId());

        mTracer.logAborted(transition.mInfo.getDebugId());