summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2025-02-19 16:14:34 +0800
committer Riddle Hsu <riddlehsu@google.com> 2025-02-19 01:49:43 -0800
commit4c3ccd9ab9040d33cad1e8cfdb87bb9a4aba567d (patch)
treed71ffcd900af460ded7bd0da3837ad80646cfca8
parent80f15bd5de84149f62588473e2e72558fb477c44 (diff)
Allow to pause finishing transient launch
In case the active recents activity requests to finish Bug: 346588978 Flag: EXEMPT bugfix Test: Finish recents while it is in overview state. Change-Id: I60f84dec8233366194535ba6a85332ebe3c22a94
-rw-r--r--services/core/java/com/android/server/wm/TaskFragment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 97a1a34336e9..be81d622e820 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -1911,7 +1911,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (!hasDirectChildActivities()) {
return false;
}
- if (mResumedActivity != null && mTransitionController.isTransientLaunch(mResumedActivity)) {
+ if (mResumedActivity != null && !mResumedActivity.finishing
+ && mTransitionController.isTransientLaunch(mResumedActivity)) {
// Even if the transient activity is occluded, defer pausing (addToStopping will still
// be called) it until the transient transition is done. So the current resuming
// activity won't need to wait for additional pause complete.