From a7e2e1643b625d045e315a85680ef6263cd58571 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 24 Feb 2022 22:09:53 +0000 Subject: [PATCH] Account for animating children when updating task visibility - It's possible for the root task to be hidden and not made visible again if only its children (ie. a leaf task) are animating Bug: 218403080 Bug: 213603716 Test: atest NexusLauncherTests Change-Id: I5f8b61afcbeff1974c8a60f62490afa602428219 --- services/core/java/com/android/server/wm/Task.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index ffa1a601d41b5..873026fcdc841 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3289,7 +3289,7 @@ class Task extends TaskFragment { // We intend to let organizer manage task visibility but it doesn't // have enough information until we finish shell transitions. // In the mean time we do an easy fix here. - final boolean show = isVisible() || isAnimating(TRANSITION | PARENTS); + final boolean show = isVisible() || isAnimating(TRANSITION | PARENTS | CHILDREN); if (mSurfaceControl != null) { if (show != mLastSurfaceShowing) { getSyncTransaction().setVisibility(mSurfaceControl, show);