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

Commit 85d1eb5a 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: I9829427b6817ad001395d497d49364296fd48498
parents af51ee6c 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;