summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/Transition.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 9e1ee25c9255..34bf8c2839a0 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -278,13 +278,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
setTransientLaunchToChanges(activity);
if (restoreBelow != null) {
+ final Task transientRootTask = activity.getRootTask();
// Collect all visible activities which can be occluded by the transient activity to
// make sure they are in the participants so their visibilities can be updated when
// finishing transition.
((WindowContainer<?>) restoreBelow.getParent()).forAllTasks(t -> {
if (t.isVisibleRequested() && !t.isAlwaysOnTop()
&& !t.getWindowConfiguration().tasksAreFloating()) {
- if (t.isRootTask()) {
+ if (t.isRootTask() && t != transientRootTask) {
mTransientHideTasks.add(t);
}
if (t.isLeafTask()) {