Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b25c357 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

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

parents d77cf96c 232ec86d

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

+3 −4
Original line number Diff line number Diff line
@@ -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();

            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;

                }