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

Commit b80cffad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky tests" into oc-dev

parents d9417c53 153badbf

services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ class WindowTestsBase { 
                "mChildAppWindowAbove");

        mChildAppWindowBelow = createCommonWindow(mAppWindow, TYPE_APPLICATION_MEDIA_OVERLAY,

                "mChildAppWindowBelow");



        // Adding a display will cause freezing the display. Make sure to wait until it's unfrozen

        // to not run into race conditions with the tests.

        waitUntilHandlersIdle();

    }



    @After
@@ -135,6 +139,9 @@ class WindowTestsBase { 
            mDisplayContent.removeImmediately();

            sWm.mInputMethodTarget = null;

        }



        // Wait until everything is really cleaned up.

        waitUntilHandlersIdle();

    }



    private WindowState createCommonWindow(WindowState parent, int type, String name) {