diff options
| -rw-r--r-- | core/java/android/window/WindowTokenClientController.java | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/window/WindowTokenClientController.java b/core/java/android/window/WindowTokenClientController.java index 2f05f830fe09..44847073646d 100644 --- a/core/java/android/window/WindowTokenClientController.java +++ b/core/java/android/window/WindowTokenClientController.java @@ -73,6 +73,12 @@ public class WindowTokenClientController { } } + /** Creates a new instance for test only. */ + @VisibleForTesting + public static WindowTokenClientController createInstanceForTesting() { + return new WindowTokenClientController(); + } + private WindowTokenClientController() {} /** diff --git a/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java index 9793dde0aaa5..767dd8c20b77 100644 --- a/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java +++ b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java @@ -76,7 +76,7 @@ public class WindowTokenClientControllerTest { mOriginalWindowManagerService = WindowManagerGlobal.getWindowManagerService(); WindowManagerGlobal.overrideWindowManagerServiceForTesting(mWindowManagerService); doReturn(mClientToken).when(mWindowTokenClient).asBinder(); - mController = spy(WindowTokenClientController.getInstance()); + mController = spy(WindowTokenClientController.createInstanceForTesting()); } @After |