diff options
3 files changed, 2 insertions, 30 deletions
diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 27cc2d6b4aac..7fc61e1ac7f3 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -66,7 +66,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.WeakHashMap; -import java.util.function.Consumer; /** * Stores the TaskOrganizers associated with a given windowing mode and @@ -102,11 +101,8 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { */ private static class TaskOrganizerCallbacks { final ITaskOrganizer mTaskOrganizer; - final Consumer<Runnable> mDeferTaskOrgCallbacksConsumer; - TaskOrganizerCallbacks(ITaskOrganizer taskOrg, - Consumer<Runnable> deferTaskOrgCallbacksConsumer) { - mDeferTaskOrgCallbacksConsumer = deferTaskOrgCallbacksConsumer; + TaskOrganizerCallbacks(ITaskOrganizer taskOrg) { mTaskOrganizer = taskOrg; } @@ -335,11 +331,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { private final int mUid; TaskOrganizerState(ITaskOrganizer organizer, int uid) { - final Consumer<Runnable> deferTaskOrgCallbacksConsumer = - mDeferTaskOrgCallbacksConsumer != null - ? mDeferTaskOrgCallbacksConsumer - : mService.mWindowManager.mAnimator::addAfterPrepareSurfacesRunnable; - mOrganizer = new TaskOrganizerCallbacks(organizer, deferTaskOrgCallbacksConsumer); + mOrganizer = new TaskOrganizerCallbacks(organizer); mDeathRecipient = new DeathRecipient(organizer); mPendingEventsQueue = new TaskOrganizerPendingEventsQueue(this); try { @@ -484,8 +476,6 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { // Set of organized tasks (by taskId) that dispatch back pressed to their organizers private final HashSet<Integer> mInterceptBackPressedOnRootTasks = new HashSet<>(); - private Consumer<Runnable> mDeferTaskOrgCallbacksConsumer; - TaskOrganizerController(ActivityTaskManagerService atm) { mService = atm; mGlobalLock = atm.mGlobalLock; @@ -502,15 +492,6 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { } /** - * Specifies the consumer to run to defer the task org callbacks. Can be overridden while - * testing to allow the callbacks to be sent synchronously. - */ - @VisibleForTesting - public void setDeferTaskOrgCallbacksConsumer(Consumer<Runnable> consumer) { - mDeferTaskOrgCallbacksConsumer = consumer; - } - - /** * Register a TaskOrganizer to manage tasks as they enter the a supported windowing mode. */ @Override 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 74aabe15ba34..aa9c0c8457f5 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -94,7 +94,6 @@ import androidx.test.filters.SmallTest; import com.android.server.wm.TaskOrganizerController.PendingTaskEvent; import com.android.window.flags.Flags; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -153,13 +152,6 @@ public class WindowOrganizerTests extends WindowTestsBase { return createTask(mDisplayContent); } - @Before - public void setUp() { - // We defer callbacks since we need to adjust task surface visibility, but for these tests, - // just run the callbacks synchronously - mWm.mAtmService.mTaskOrganizerController.setDeferTaskOrgCallbacksConsumer((r) -> r.run()); - } - @Test public void testAppearVanish() throws RemoteException { final ITaskOrganizer organizer = registerMockOrganizer(); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 0ee78e38301c..28e03bfeaadb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -1791,7 +1791,6 @@ class WindowTestsBase extends SystemServiceTestsBase { TestStartingWindowOrganizer(ActivityTaskManagerService service) { mAtm = service; mWMService = mAtm.mWindowManager; - mAtm.mTaskOrganizerController.setDeferTaskOrgCallbacksConsumer(Runnable::run); mAtm.mTaskOrganizerController.registerTaskOrganizer(this); } |