summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author tanxiaoyan <tanxiaoyan@xiaomi.com> 2024-10-09 21:21:32 +0800
committer tanxiaoyan <tanxiaoyan@xiaomi.com> 2024-10-11 10:15:33 +0800
commit3d7743701c22add8952a2725d082bbcee20624bb (patch)
treed473b37c71d430c97d78fe498748532bca401b83
parent2b3c5dc2e7b19c18af3c7f05d2fa02ff973ab702 (diff)
Avoid set transition ready to false when backgroud activity launch blocked
Fix the following scenario problem: When creating an OPEN transition, collecting participants and apply ready true. At this time, another activity is started in the background and blocked. We collect this activity and set transition ready false, but we have no chance to set ready to true again until readiness timed-out. Bug:372405077 Change-Id: I10c34183fcc3b9a8bc0fc71252cfb76666c6f6af Signed-off-by: tanxiaoyan <tanxiaoyan@xiaomi.com>
-rw-r--r--services/core/java/com/android/server/wm/ActivityStarter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index e6d81324efa1..f2036313159f 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1684,7 +1684,7 @@ class ActivityStarter {
remoteTransition, null /* displayChange */);
} else if (result == START_SUCCESS && mStartActivity.isState(RESUMED)) {
// Do nothing if the activity is started and is resumed directly.
- } else if (isStarted) {
+ } else if (isStarted && (mBalCode != BAL_BLOCK || mDoResume)) {
// Make the collecting transition wait until this request is ready.
transitionController.setReady(started, false);
}