Commit e3636017 authored Mar 16, 2023 by Kazuki Takise

Use pending transition when task-org is unregistered

When a task-org is unregistered, the surface controls of all the
tasks organized by it are recreated, and their parent-child
relationship is reestablished with the new surface controls.

However, as different transactions are used for this recreate
operations, reparent() could be applied in an unexpected order,
and could some layers left detached in SF.

This CL replaces sync transition with pending transition in
TaskOrgController#removeTask() to ensure that the same transaction
is used for a series of operations.

Bug: 271357562
Test: WM CTS no longer causes ANR.
Change-Id: I8a95d3f03ae8f5dfafbca29b7e1bd252762c351c

parent 9ce369b8

services/core/java/com/android/server/wm/TaskOrganizerController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
		boolean taskAppearedSent = t.mTaskAppearedSent;
		if (taskAppearedSent) {
		if (t.getSurfaceControl() != null) {
		t.migrateToNewSurfaceControl(t.getSyncTransaction());
		t.migrateToNewSurfaceControl(t.getPendingTransaction());
		}
		t.mTaskAppearedSent = false;
		}