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

Commit 024fba87 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix flaky tests" into oc-dev am: b80cffad 

am: 9c0e3b43

Change-Id: I7b21decefdea2bc52a6b9c1283d0189724091488
parents 9ff9b9af 9c0e3b43

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) {