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

Commit a5c1755a authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix task root bounds be overwritten when dismiss split screen." into... 

Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded461 am: 6f5e6799

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

Change-Id: Ifd5f9cfce04ab35856e85d752706960b0cd00ed3
parents b8c7cb2e 6f5e6799

packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java

+5 −1
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ public class WindowManagerProxy { 
        // as a result, the above will not capture any tasks; yet, we need to clean-up the

        // home task bounds.

        List<ActivityManager.RunningTaskInfo> freeHomeAndRecents =

                TaskOrganizer.getRootTasks(Display.DEFAULT_DISPLAY, HOME_AND_RECENTS);

                TaskOrganizer.getRootTasks(DEFAULT_DISPLAY, HOME_AND_RECENTS);

        // Filter out the root split tasks

        freeHomeAndRecents.removeIf(p -> p.token.equals(tiles.mSecondary.token)

                || p.token.equals(tiles.mPrimary.token));



        if (primaryChildren.isEmpty() && secondaryChildren.isEmpty()

                && freeHomeAndRecents.isEmpty()) {

            return;