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

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

Change-Id: Iddcad051ec8e1c9ec9d54a0de2f584141002ef60
This commit is contained in:
Wei Sheng Shih
2020-06-12 06:46:58 +00:00
committed by Automerger Merge Worker

View File

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