Merge "Fix finishing adjacent TaskFragments occludes activities below" into sc-v2-dev

1 files changed, 3 insertions, 4 deletions

diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
index 852a6583b680..6560d15ca744 100644
--- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
+++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
@@ -103,13 +103,12 @@ class EnsureActivitiesVisibleHelper {
         ArrayList<TaskFragment> adjacentTaskFragments = null;
         for (int i = mTaskFragment.mChildren.size() - 1; i >= 0; --i) {
             final WindowContainer child = mTaskFragment.mChildren.get(i);
-            if (child.asTaskFragment() != null) {
-                final TaskFragment childTaskFragment = child.asTaskFragment();
+            final TaskFragment childTaskFragment = child.asTaskFragment();
+            if (childTaskFragment != null && childTaskFragment.topRunningActivity() != null) {
                 childTaskFragment.updateActivityVisibilities(starting, configChanges,
                         preserveWindows, notifyClients);
                 mBehindFullyOccludedContainer |=
-                        childTaskFragment.topRunningActivity() != null
-                                && childTaskFragment.getBounds().equals(mTaskFragment.getBounds());
+                        childTaskFragment.getBounds().equals(mTaskFragment.getBounds());
                 if (mAboveTop && mTop.getTaskFragment() == childTaskFragment) {
                     mAboveTop = false;
                 }