commit 8462b296b5050db6560ce3af2f311c348869f640
author Louis Chang <louischang@google.com> Fri Sep 24 01:09:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 24 01:09:10 2021 +0000
tree e016fee6a0033049622a49a63f97ddc4b239551e
parent b67f5c308b76b0120d05098be6223a71988bee1a
parent 165d4a12389cc9703c255c5493b808f3a54b3f40

Merge "TaskFragment without running activity cannot occlude others" into sc-v2-dev am: 2f47fab607 am: 165d4a1238

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15884452

Change-Id: I5884350d44bb6962f114ec3fa33a547676d09dfe

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;
                 }