From ad9cf73bee55e9b3de953e706784335a4e4567df Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 22 Mar 2024 05:51:04 +0000
Subject: [PATCH] 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
---
 .../com/android/quickstep/util/FadeOutRemoteTransition.kt  | 7 +------
 .../android/quickstep/util/SplitSelectStateController.java | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt b/quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt
index 32a15a2875..24e261f9d9 100644
--- a/quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt
+++ b/quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt
@@ -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(
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 34a75d0e1e..d8cbbf9d10 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -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)