From 823bf016873f8803b4972733d4a84a351c34afbf Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Tue, 18 Oct 2022 23:59:01 +0800
Subject: [PATCH] Reset factory of TaskPositioner in test

Depending on the execution order of test methods, after executing
TaskPositionerTests#testOverrideFactory, the next test method in
TaskPositioningControllerTests may be failed because the test
static factory returns null.

Clear the factory so it will use default implementation that returns
non-null TaskPositioner.

Bug: 254268165
Bug: 285565300
Test: atest TaskPositionerTests TaskPositioningControllerTests
Change-Id: I6c9abb60ce6d1a8631ad07b63d6e0d04c2f76b39
(cherry picked from commit 678aa417ac3d56d5f0d66f760bb90a49b83ffc4b)
---
 .../wmtests/src/com/android/server/wm/TaskPositionerTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
index 7abe3698a99c1..d5356774ffdb7 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
@@ -88,7 +88,7 @@ public class TaskPositionerTests extends WindowTestsBase {
 
     @After
     public void tearDown() {
-        mPositioner = null;
+        TaskPositioner.setFactory(null);
     }
 
     @Test