TaskFragment without running activity cannot occlude others

A TaskFragment that doesn't contain any running activity should
not occlude the activities behind.

Bug: 200316506
Test: TaskFragmentOrganizerTest
Change-Id: I64823680e8adc04f506410aa051bbfe5989cfbaf

1 files changed, 3 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
index fed4f6205a3b..852a6583b680 100644
--- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
+++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
@@ -107,8 +107,9 @@ class EnsureActivitiesVisibleHelper {
                 final TaskFragment childTaskFragment = child.asTaskFragment();
                 childTaskFragment.updateActivityVisibilities(starting, configChanges,
                         preserveWindows, notifyClients);
-                mBehindFullyOccludedContainer |= childTaskFragment.getBounds().equals(
-                        mTaskFragment.getBounds());
+                mBehindFullyOccludedContainer |=
+                        childTaskFragment.topRunningActivity() != null
+                                && childTaskFragment.getBounds().equals(mTaskFragment.getBounds());
                 if (mAboveTop && mTop.getTaskFragment() == childTaskFragment) {
                     mAboveTop = false;
                 }