diff options
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java | 12 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 8b9849e1fcd8..94c7a325cad4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -253,7 +253,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { final Session session = createTestSession(mAtm, wpc.getPid(), wpc.mUid); spyOn(session); assertTrue(session.mCanAddInternalSystemWindow); - final WindowState window = createWindow(null, LayoutParams.TYPE_PHONE, "win"); + final WindowState window = newWindowBuilder("win", LayoutParams.TYPE_PHONE).build(); session.onWindowSurfaceVisibilityChanged(window, true /* visible */); verify(session).setHasOverlayUi(true); session.onWindowSurfaceVisibilityChanged(window, false /* visible */); @@ -262,7 +262,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { @Test public void testRelayoutExitingWindow() { - final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, "appWin"); + final WindowState win = newWindowBuilder("appWin", TYPE_BASE_APPLICATION).build(); win.mWinAnimator.mDrawState = WindowStateAnimator.HAS_DRAWN; win.mWinAnimator.mSurfaceControl = mock(SurfaceControl.class); spyOn(win.mTransitionController); @@ -396,7 +396,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { int startPrivateFlags, int newFlags, int newPrivateFlags, int expectedChangedFlags, int expectedChangedPrivateFlags, int expectedFlagsValue, int expectedPrivateFlagsValue) { - final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, "appWin"); + final WindowState win = newWindowBuilder("appWin", TYPE_BASE_APPLICATION).build(); win.mRelayoutCalled = !firstRelayout; mWm.mWindowMap.put(win.mClient.asBinder(), win); spyOn(mDisplayContent.mDwpcHelper); @@ -529,7 +529,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { public void testAddWindowWithSubWindowTypeByWindowContext() { spyOn(mWm.mWindowContextListenerController); - final WindowState parentWin = createWindow(null, TYPE_INPUT_METHOD, "ime"); + final WindowState parentWin = newWindowBuilder("ime", TYPE_INPUT_METHOD).build(); final IBinder parentToken = parentWin.mToken.token; parentWin.mAttrs.token = parentToken; mWm.mWindowMap.put(parentToken, parentWin); @@ -1260,8 +1260,8 @@ public class WindowManagerServiceTests extends WindowTestsBase { final IWindow window = mock(IWindow.class); final IBinder binder = mock(IBinder.class); doReturn(binder).when(window).asBinder(); - final WindowState windowState = - createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "appWin", window); + final WindowState windowState = newWindowBuilder("appWin", + TYPE_BASE_APPLICATION).setDisplay(mDisplayContent).setClientWindow(window).build(); doNothing().when(mWm.mContext).enforceCallingOrSelfPermission(anyString(), anyString()); doReturn(windowState).when(mWm).getFocusedWindowLocked(); doReturn(windowState).when(mWm.mRoot).getCurrentInputMethodWindow(); 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 b61dada809d8..ce0d91264063 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -585,14 +585,6 @@ public class WindowTestsBase extends SystemServiceTestsBase { } // TODO: Move these calls to a builder? - WindowState createWindow(WindowState parent, int type, DisplayContent dc, String name, - IWindow iwindow) { - final WindowToken token = createWindowToken( - dc, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, type); - return createWindow(parent, type, token, name, 0 /* ownerId */, - false /* ownerCanAddInternalSystemWindow */, iwindow); - } - WindowState createWindow(WindowState parent, int type, String name) { return (parent == null) ? createWindow(parent, type, mDisplayContent, name) |