From 6bdefb5a742e0e916a5975a45b0ca36dbce64d7d Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Thu, 9 Sep 2021 15:30:07 +0800 Subject: [PATCH] Do not calculate rotated override bounds for organized tasks The task organizers in WMShell already handle the rotation case. E.g. LegacySplitScreenController, StageCoordinator. Bug: 163976519 Test: CtsActivityManagerDeviceTestCases Change-Id: Id9c07ef1fac233bf986f7267765e659d65d3f76c --- services/core/java/com/android/server/wm/Task.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 7bdb1a090c1a6..424a5aa98afda 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1990,14 +1990,7 @@ class Task extends TaskFragment { taskDisplayArea.onRootTaskWindowingModeChanged(this); } - if (mDisplayContent == null) { - return; - } - - // Use override windowing mode to prevent extra bounds changes if inheriting the mode. - final int overrideWindowingMode = getRequestedOverrideWindowingMode(); - if (overrideWindowingMode != WINDOWING_MODE_PINNED - && !getRequestedOverrideBounds().isEmpty()) { + if (!isOrganized() && !getRequestedOverrideBounds().isEmpty() && mDisplayContent != null) { // If the parent (display) has rotated, rotate our bounds to best-fit where their // bounds were on the pre-rotated display. final int newRotation = getWindowConfiguration().getRotation();