Prevent merging transitions if we don't handle it

- If we don't handle merging the transition, it will play sequentially
  after the current transition (see ag/26641113)

Bug: 330821548
Test: N/a
Change-Id: I7d35cc173d8ced8ba9b9df02dd8a571ca08e9de7
This commit is contained in:
Winson Chung
2024-03-22 05:51:04 +00:00
parent 34c6253778
commit ad9cf73bee
2 changed files with 4 additions and 7 deletions
@@ -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(
@@ -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)