commit 2f47fab6077773e6436e51f8452e5b3a76d2dac5
author Louis Chang <louischang@google.com> Fri Sep 24 00:38:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 24 00:38:52 2021 +0000
tree 4e7bd3043ced875ac67c8f73068fb7d99b70faf8
parent 731b8775b4ef3a79ab52db2b2c939590a1ed18a0
parent 33efd883cd4b1866df8cf3d20923c8905c944b4b

Merge "TaskFragment without running activity cannot occlude others" into sc-v2-dev

services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java

diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
index fed4f62..852a658 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 @@
                 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;
                 }