From cc39a10dd01986e251707759f42e6589eb70bcf1 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Thu, 21 Mar 2024 11:30:39 +0800 Subject: [PATCH] Do not report finish in mergeAnimation... ...if the handler don't know how to process the transition. So the Transitions can pass that transition to next handler. Flag: NONE Bug: 328619216 Test: manual, use alt+tab to relaunch a task where it's activity is destroyed. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7130116894eb7f756a16da6b5ff0e754a356d50d) Merged-In: Idf3f78103a56e91806ec2f6e364c6e8e7f4e205c Change-Id: Idf3f78103a56e91806ec2f6e364c6e8e7f4e205c 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev. --- .../taskbar/KeyboardQuickSwitchViewController.java | 3 ++- .../com/android/quickstep/util/SlideInRemoteTransition.kt | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java index c830aa8640..701edd000b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java @@ -151,7 +151,8 @@ public class KeyboardQuickSwitchViewController { context.getDeviceProfile().overviewPageSpacing, QuickStepContract.getWindowCornerRadius(context), AnimationUtils.loadInterpolator( - context, android.R.interpolator.fast_out_extra_slow_in))); + context, android.R.interpolator.fast_out_extra_slow_in)), + "SlideInTransition"); if (mOnDesktop) { UI_HELPER_EXECUTOR.execute(() -> SystemUiProxy.INSTANCE.get(mKeyboardQuickSwitchView.getContext()) diff --git a/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt b/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt index 9f7b46d90f..134729163e 100644 --- a/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt +++ b/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt @@ -46,12 +46,7 @@ class SlideInRemoteTransition( 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(