From e82d9b2cb1ff7937bfd218823d99ca3a64e1572e Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Thu, 28 Nov 2024 07:53:38 +0000 Subject: Always set transition ready in executeAppTransition. To set the transition ready signal even if the top resumed activity is in a TaskFragment. Flag: EXEMPT bugfix Bug: 380830218 Test: atest ActivityLifecycleTests ActivityLifecycleTopResumedStateTests Test: Launch an app that has use activity embedded for its activity, move the app to desktop windowing mode, then launch another app. Close the last app with finish and verify there won't encounter transition timeout. Change-Id: Ifed7edad77b9b7c67147a903ba538fd85ec10af0 --- services/core/java/com/android/server/wm/Task.java | 6 ------ services/core/java/com/android/server/wm/TaskFragment.java | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 87e472ab7aa6..f090ef1b72e9 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -6292,12 +6292,6 @@ class Task extends TaskFragment { return mAnimatingActivityRegistry; } - @Override - void executeAppTransition(ActivityOptions options) { - mDisplayContent.executeAppTransition(); - ActivityOptions.abort(options); - } - private Rect getRawBounds() { return super.getBounds(); } diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index e090b1980c6d..51b8bd1f0091 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -2129,7 +2129,8 @@ class TaskFragment extends WindowContainer { } void executeAppTransition(ActivityOptions options) { - // No app transition applied to the task fragment. + mDisplayContent.executeAppTransition(); + ActivityOptions.abort(options); } @Override -- cgit v1.2.3-59-g8ed1b