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

2021-09-24 00:38:52 +00:00
parent 731b8775b4 33efd883cd
commit 2f47fab607
1 changed files with 3 additions and 2 deletions
--- 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;
                }