Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc026e47 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky WindowTokenClientControllerTest" into main

parents 8bb782d7 ff97716a

core/java/android/window/WindowTokenClientController.java

+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,12 @@ public class WindowTokenClientController { 
        }

    }



    /** Creates a new instance for test only. */

    @VisibleForTesting

    public static WindowTokenClientController createInstanceForTesting() {

        return new WindowTokenClientController();

    }



    private WindowTokenClientController() {}



    /**

core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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