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

Commit a0c3169c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent merging transitions if we don't handle it" into main

parents 7afab539 ad9cf73b

quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt

+1 −6
Original line number Diff line number Diff line
@@ -37,12 +37,7 @@ class FadeOutRemoteTransition : IRemoteTransition.Stub() { 
        mergeTarget: IBinder,

        finishCB: IRemoteTransitionFinishedCallback

    ) {



        try {

            finishCB.onTransitionFinished(null, Transaction())

        } catch (e: RemoteException) {

            // Ignore

        }

        // Do not report finish if we don't know how to handle this transition.

    }



    override fun startAnimation(

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+3 −1
Original line number Diff line number Diff line
@@ -772,7 +772,9 @@ public class SplitSelectStateController { 
        @Override

        public void mergeAnimation(IBinder transition, TransitionInfo info,

                SurfaceControl.Transaction t, IBinder mergeTarget,

                IRemoteTransitionFinishedCallback finishedCallback) { }

                IRemoteTransitionFinishedCallback finishedCallback) {

            // Do not report finish if we don't know how to handle this transition.

        }



        @Override

        public void onTransitionConsumed(IBinder transition, boolean aborted)