Reduce layer assignment and placement for intermediate state
There may be no need to request traversal for all hierarchy changes.
Such as even if there is a z-order change, but if the client has
not drawn yet, the displayed content may not show visible changes
by the traversal because there is nothing to show or the transaction needs to be synchronized.
So instead of requesting to update surface/focus on intermediate
changes, let the existing signals: "relayout, add/remove window,
destroy surface, lifecycle callback, window container transaction,
significant changes detected in deferWindowLayout~continueWindowLayout"
trigger the update. In other words, focus more on dealing with
changes that are actually visible.
For example, this can reduce the number of passed for layoutAndAssignWindowLayers by 3 times and surface placement by 1 time
for startActivityInner.
Some tests depended on the setup in WindowTestsBase.ActivityBuilder
to dispatch pending organizer events. Since this change no longer
triggers traversal to dispatch them in the builder, refine the tests
to send the events by themselves.
Bug: 159103089
Test: CtsWindowManagerDeviceTestCases
Change-Id: Ib9c008994dbbc4d6e1dd1ca3e37b9aa0ccaba997
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index d93a62d..5a2a58e 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3978,23 +3978,6 @@
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
- // TODO: This should probably be called any time a visual change is made to the hierarchy like
- // moving containers or resizing them. Need to investigate the best way to have it automatically
- // happen so we don't run into issues with programmers forgetting to do it.
- void layoutAndAssignWindowLayersIfNeeded() {
- mWmService.mWindowsChanged = true;
- setLayoutNeeded();
-
- if (!mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,
- false /*updateInputWindows*/)) {
- assignWindowLayers(false /* setLayoutNeeded */);
- }
-
- mInputMonitor.setUpdateInputWindowsNeededLw();
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- mInputMonitor.updateInputWindowsLw(false /*force*/);
- }
-
/** Returns true if a leaked surface was destroyed */
boolean destroyLeakedSurfaces() {
// Used to indicate that a surface was leaked.
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index ee11f68..267cf76 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5874,9 +5874,6 @@
}
positionChildAt(POSITION_TOP, child, true /* includingParents */);
-
- final DisplayContent displayContent = getDisplayContent();
- displayContent.layoutAndAssignWindowLayersIfNeeded();
}
void positionChildAtBottom(Task child) {
@@ -5897,7 +5894,6 @@
}
positionChildAt(POSITION_BOTTOM, child, includingParents);
- getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
}
@Override
@@ -5911,12 +5907,6 @@
// Non-root task position changed.
mRootWindowContainer.invalidateTaskLayers();
}
-
- final boolean isTop = getTopChild() == child;
- if (isTop) {
- final DisplayContent displayContent = getDisplayContent();
- displayContent.layoutAndAssignWindowLayersIfNeeded();
- }
}
void reparent(TaskDisplayArea newParent, boolean onTop) {
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index 0457408..a0608db 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -405,8 +405,6 @@
child.updateTaskMovement(moveToTop, targetPosition);
- mDisplayContent.layoutAndAssignWindowLayersIfNeeded();
-
// The insert position may be adjusted to non-top when there is always-on-top root task.
// Since the original position is preferred to be top, the root task should have higher
// priority when we are looking for top focusable root task. The condition {@code
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index b06bdb1..666b4d6 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -566,7 +566,6 @@
onDisplayChanged(dc);
prevDc.setLayoutNeeded();
}
- getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
// Send onParentChanged notification here is we disabled sending it in setParent for
// reparenting case.
diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 73e417e..1ed0723 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -52,7 +52,6 @@
import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_START_SHORTCUT;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WINDOW_ORGANIZER;
-import static com.android.server.wm.ActivityTaskManagerService.LAYOUT_REASON_CONFIG_CHANGED;
import static com.android.server.wm.ActivityTaskManagerService.enforceTaskPermission;
import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;
import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_PINNED_TASK;
@@ -622,8 +621,8 @@
}
}
- if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) != 0) {
- mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED);
+ if (effects != 0) {
+ mService.mWindowManager.mWindowPlacerLocked.requestTraversal();
}
} finally {
mService.mTaskSupervisor.setDeferRootVisibilityUpdate(false /* deferUpdate */);
diff --git a/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java b/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java
index 0568b38..c0a90b2 100644
--- a/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java
@@ -182,13 +182,11 @@
@Test
public void testApplicationNotInFocusWithModeId() {
final WindowState appWindow = createWindow("appWindow");
- assertEquals(appWindow.mFrameRateSelectionPriority, RefreshRatePolicy.LAYER_PRIORITY_UNSET);
- assertEquals(appWindow.mFrameRateVote, FRAME_RATE_VOTE_NONE);
-
- final WindowState inFocusWindow = createWindow("inFocus");
- appWindow.mToken.mDisplayContent.mCurrentFocus = inFocusWindow;
-
+ mDisplayContent.mCurrentFocus = appWindow;
appWindow.updateFrameRateSelectionPriorityIfNeeded();
+ mDisplayContent.mCurrentFocus = null;
+ appWindow.updateFrameRateSelectionPriorityIfNeeded();
+
// The window is not in focus.
assertEquals(appWindow.mFrameRateSelectionPriority, RefreshRatePolicy.LAYER_PRIORITY_UNSET);
assertEquals(appWindow.mFrameRateVote, FRAME_RATE_VOTE_NONE);
@@ -211,13 +209,11 @@
@Test
public void testApplicationNotInFocusWithoutModeId() {
final WindowState appWindow = createWindow("appWindow");
- assertEquals(appWindow.mFrameRateSelectionPriority, RefreshRatePolicy.LAYER_PRIORITY_UNSET);
- assertEquals(appWindow.mFrameRateVote, FRAME_RATE_VOTE_NONE);
-
- final WindowState inFocusWindow = createWindow("inFocus");
- appWindow.mToken.mDisplayContent.mCurrentFocus = inFocusWindow;
-
+ mDisplayContent.mCurrentFocus = appWindow;
appWindow.updateFrameRateSelectionPriorityIfNeeded();
+ mDisplayContent.mCurrentFocus = null;
+ appWindow.updateFrameRateSelectionPriorityIfNeeded();
+
// The window is not in focus.
assertEquals(appWindow.mFrameRateSelectionPriority, RefreshRatePolicy.LAYER_PRIORITY_UNSET);
assertEquals(appWindow.mFrameRateVote, FRAME_RATE_VOTE_NONE);
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
index 40e8273..060f9d8 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
@@ -352,6 +352,8 @@
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
final ActivityRecord activity = createActivityRecord(mDisplayContent);
+ // Flush EVENT_APPEARED.
+ mController.dispatchPendingEvents();
final Task task = activity.getTask();
activity.info.applicationInfo.uid = uid;
doReturn(pid).when(activity).getPid();
@@ -379,6 +381,8 @@
DEFAULT_TASK_FRAGMENT_ORGANIZER_PROCESS_NAME);
activity.reparent(taskFragment, POSITION_TOP);
activity.mLastTaskFragmentOrganizerBeforePip = null;
+ // Flush EVENT_INFO_CHANGED.
+ mController.dispatchPendingEvents();
// Clear invocations now because there will be another transaction for the TaskFragment
// change above, triggered by the reparent. We only want to test onActivityReparentedToTask
@@ -400,6 +404,8 @@
final Task task = createTask(mDisplayContent);
task.addChild(mTaskFragment, POSITION_TOP);
final ActivityRecord activity = createActivityRecord(task);
+ // Flush EVENT_APPEARED.
+ mController.dispatchPendingEvents();
// Make sure the activity belongs to the same app, but it is in a different pid.
activity.info.applicationInfo.uid = uid;
@@ -442,6 +448,8 @@
final Task task = createTask(mDisplayContent);
task.addChild(mTaskFragment, POSITION_TOP);
final ActivityRecord activity = createActivityRecord(task);
+ // Flush EVENT_APPEARED.
+ mController.dispatchPendingEvents();
// Make sure the activity is embedded in untrusted mode.
activity.info.applicationInfo.uid = uid + 1;
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
index b2761d1..169586e 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
@@ -871,6 +871,7 @@
lastReportedTiles.clear();
called[0] = false;
task1.positionChildAt(POSITION_TOP, rootTask, false /* includingParents */);
+ mAtm.mTaskOrganizerController.dispatchPendingEvents();
assertTrue(called[0]);
assertEquals(ACTIVITY_TYPE_STANDARD, lastReportedTiles.get(0).topActivityType);
@@ -1124,11 +1125,11 @@
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord record = createActivityRecord(rootTask.mDisplayContent, task);
+ final ActivityRecord record = createActivityRecordAndDispatchPendingEvents(task);
rootTask.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
record.setTaskDescription(new ActivityManager.TaskDescription("TestDescription"));
- waitUntilHandlersIdle();
+ mAtm.mTaskOrganizerController.dispatchPendingEvents();
assertEquals("TestDescription", o.mChangedInfo.taskDescription.getLabel());
}
@@ -1288,6 +1289,8 @@
public void testAppearDeferThenInfoChange() {
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
+ // Flush EVENT_APPEARED.
+ mAtm.mTaskOrganizerController.dispatchPendingEvents();
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1310,6 +1313,8 @@
public void testAppearDeferThenVanish() {
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
+ // Flush EVENT_APPEARED.
+ mAtm.mTaskOrganizerController.dispatchPendingEvents();
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1328,7 +1333,7 @@
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord record = createActivityRecord(rootTask.mDisplayContent, task);
+ final ActivityRecord record = createActivityRecordAndDispatchPendingEvents(task);
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1358,7 +1363,7 @@
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord record = createActivityRecord(rootTask.mDisplayContent, task);
+ final ActivityRecord record = createActivityRecordAndDispatchPendingEvents(task);
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1381,7 +1386,7 @@
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord record = createActivityRecord(rootTask.mDisplayContent, task);
+ createActivityRecordAndDispatchPendingEvents(task);
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1400,7 +1405,7 @@
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord record = createActivityRecord(rootTask.mDisplayContent, task);
+ final ActivityRecord record = createActivityRecordAndDispatchPendingEvents(task);
// Assume layout defer
mWm.mWindowPlacerLocked.deferLayout();
@@ -1465,13 +1470,12 @@
final ITaskOrganizer organizer = registerMockOrganizer();
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
- final ActivityRecord activity = createActivityRecord(rootTask.mDisplayContent, task);
+ final ActivityRecord activity = createActivityRecordAndDispatchPendingEvents(task);
final ArgumentCaptor<RunningTaskInfo> infoCaptor =
ArgumentCaptor.forClass(RunningTaskInfo.class);
assertTrue(rootTask.isOrganized());
- spyOn(activity);
doReturn(true).when(activity).inSizeCompatMode();
doReturn(true).when(activity).isState(RESUMED);
@@ -1550,6 +1554,13 @@
verify(mWm.mAtmService.mRootWindowContainer).resumeFocusedTasksTopActivities();
}
+ private ActivityRecord createActivityRecordAndDispatchPendingEvents(Task task) {
+ final ActivityRecord record = createActivityRecord(task);
+ // Flush EVENT_APPEARED.
+ mAtm.mTaskOrganizerController.dispatchPendingEvents();
+ return record;
+ }
+
/**
* Verifies that task vanished is called for a specific task.
*/
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index c44869b..725f187 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -48,7 +48,6 @@
import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;
import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
-import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doThrow;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;
@@ -103,7 +102,6 @@
import androidx.test.filters.SmallTest;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -124,15 +122,6 @@
@RunWith(WindowTestRunner.class)
public class WindowStateTests extends WindowTestsBase {
- @Before
- public void setUp() {
- // TODO: Let the insets source with new mode keep the visibility control, and remove this
- // setup code. Now mTopFullscreenOpaqueWindowState will take back the control of insets
- // visibility.
- spyOn(mDisplayContent);
- doNothing().when(mDisplayContent).layoutAndAssignWindowLayersIfNeeded();
- }
-
@Test
public void testIsParentWindowHidden() {
final WindowState parentWindow = createWindow(null, TYPE_APPLICATION, "parentWindow");
