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

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

Merge "Use an empty transitioninfo for force-sleep" into udc-dev am: 376afbce am: 01a7d12d 

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



Change-Id: Ic6f1a516eb71d5680cc775f402c0030c95da16a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac3d5b54 01a7d12d

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

+1 −1
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ class SleepHandler implements Transitions.TransitionHandler { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        mSleepTransitions.remove(transition);

        startTransaction.apply();

        finishCallback.onTransitionFinished(null, null);

        mSleepTransitions.remove(transition);

        return true;

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ public class Transitions implements RemoteCallable<Transitions> { 
            onFinish(forceFinish, null, null);

        }

        final SurfaceControl.Transaction dummyT = new SurfaceControl.Transaction();

        final TransitionInfo dummyInfo = new TransitionInfo(TRANSIT_SLEEP, 0 /* flags */);

        while (!mActiveTransitions.isEmpty() && !mSleepHandler.mSleepTransitions.isEmpty()) {

            final ActiveTransition playing = mActiveTransitions.get(0);

            int sleepIdx = findByToken(mReadyTransitions, mSleepHandler.mSleepTransitions.get(0));
@@ -995,7 +996,7 @@ public class Transitions implements RemoteCallable<Transitions> { 
                final ActiveTransition nextSleep = mReadyTransitions.get(sleepIdx);

                ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Attempt to merge SLEEP %s"

                        + " into %s", nextSleep, playing);

                playing.mHandler.mergeAnimation(nextSleep.mToken, nextSleep.mInfo, dummyT,

                playing.mHandler.mergeAnimation(nextSleep.mToken, dummyInfo, dummyT,

                        playing.mToken, (wct, cb) -> {});

            } else {

                Log.e(TAG, "Couldn't find sleep transition in ready list: "