Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the tasks created by the organizer when it dies." into tm-dev

Browse Source
This commit is contained in:
Gaurav Bhola
2022-03-25 16:04:36 +00:00
committed by Android (Google) Code Review
parent 20f8f2989d 4d63b2bdf1
commit 5e5efacd1f
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -251,7 +251,13 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
// possible.
while (!mOrganizedTasks.isEmpty()) {
final Task t = mOrganizedTasks.get(0);
t.updateTaskOrganizerState(true /* forceUpdate */);
if (t.mCreatedByOrganizer) {
// The tasks created by this organizer should ideally be deleted when this
// organizer is disposed off to avoid inconsistent behavior.
t.removeImmediately();
} else {
t.updateTaskOrganizerState(true /* forceUpdate */);
}
if (mOrganizedTasks.contains(t)) {
// updateTaskOrganizerState should remove the task from the list, but still
// check it again to avoid while-loop isn't terminate.

46
services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
View File

@@ -308,6 +308,52 @@ public class WindowOrganizerTests extends WindowTestsBase {
assertTaskVanished(organizer2, true /* expectVanished */, rootTask, rootTask2, rootTask3);
}
@Test
public void testUnregisterOrganizer_removesTasksCreatedByIt() throws RemoteException {
final Task rootTask = createRootTask();
final Task task = createTask(rootTask);
final Task rootTask2 = createRootTask();
rootTask2.mCreatedByOrganizer = true;
final Task task2 = createTask(rootTask2);
final ArrayList<TaskAppearedInfo> existingTasks = new ArrayList<>();
final ITaskOrganizer organizer = registerMockOrganizer(existingTasks);
// Ensure events dispatch to organizer.
mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
// verify that tasks are returned and taskAppeared is called only for rootTask2 since it
// is the one created by this organizer.
assertContainsTasks(existingTasks, rootTask);
verify(organizer, times(1)).onTaskAppeared(any(RunningTaskInfo.class),
any(SurfaceControl.class));
verify(organizer, times(0)).onTaskVanished(any());
assertTrue(rootTask.isOrganized());
// Now we replace the registration and verify the new organizer receives existing tasks
final ArrayList<TaskAppearedInfo> existingTasks2 = new ArrayList<>();
final ITaskOrganizer organizer2 = registerMockOrganizer(existingTasks2);
// Ensure events dispatch to organizer.
mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
assertContainsTasks(existingTasks2, rootTask);
verify(organizer2, times(1)).onTaskAppeared(any(RunningTaskInfo.class),
any(SurfaceControl.class));
verify(organizer2, times(0)).onTaskVanished(any());
// Removed tasks from the original organizer
assertTaskVanished(organizer, true /* expectVanished */, rootTask, rootTask2);
assertTrue(rootTask2.isOrganized());
// Now we unregister the second one, the first one should automatically be reregistered
// so we verify that it's now seeing changes.
mWm.mAtmService.mTaskOrganizerController.unregisterTaskOrganizer(organizer2);
// Ensure events dispatch to organizer.
mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
verify(organizer, times(2))
.onTaskAppeared(any(RunningTaskInfo.class), any(SurfaceControl.class));
assertFalse(rootTask2.isOrganized());
assertTaskVanished(organizer2, true /* expectVanished */, rootTask,
rootTask2);
}
@Test
public void testOrganizerDeathReturnsRegistrationToPrevious() throws RemoteException {
final Task rootTask = createRootTask();