From 0557739e43d535cf3e9fba68a5e3d10b79e9f940 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Wed, 10 Feb 2021 16:15:51 -0800 Subject: [PATCH] Apply split-screen resize on sync queue This keeps it synchronized with dismissal and thus avoids a race between pending and sync transaction application Bug: 170801863 Test: launch a forced-multiwindow sizecompat app in split and then dismiss split to that app. App should not be cropped. Change-Id: I4d89be443af5616174ea44e62774133e3b99597c --- .../android/wm/shell/legacysplitscreen/WindowManagerProxy.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java index 94c6f018b6acd..c8f89876222ee 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java @@ -39,7 +39,6 @@ import android.view.WindowManagerGlobal; import android.window.TaskOrganizer; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; -import android.window.WindowOrganizer; import com.android.internal.annotations.GuardedBy; import com.android.wm.shell.common.SyncTransactionQueue; @@ -116,7 +115,7 @@ class WindowManagerProxy { void applyResizeSplits(int position, LegacySplitDisplayLayout splitLayout) { WindowContainerTransaction t = new WindowContainerTransaction(); splitLayout.resizeSplits(position, t); - new WindowOrganizer().applyTransaction(t); + applySyncTransaction(t); } boolean getHomeAndRecentsTasks(List out,