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

Commit bcea9cc0 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix MotionToolLib race condition in Tests" into tm-qpr-dev

parents 4c6a28c6 3b383df4

motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt

+7 −1
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ class DdmHandleMotionToolTest { 
        return MotionToolsResponse.parseFrom(wrapChunk(responseChunk).array())

    }



    private fun getActivityViewRootId() = WindowManagerGlobal.getInstance().viewRootNames.first()

    private fun getActivityViewRootId(): String {

        var activityViewRootId = ""

        activityScenarioRule.scenario.onActivity {

            activityViewRootId = WindowManagerGlobal.getInstance().viewRootNames.first()

        }

        return activityViewRootId

    }



}

motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ class MotionToolManagerTest { 


    }



    private fun getActivityViewRootId() = WindowManagerGlobal.getInstance().viewRootNames.first()



    private fun getActivityViewRootId(): String {

        var activityViewRootId = ""

        activityScenarioRule.scenario.onActivity {

            activityViewRootId = WindowManagerGlobal.getInstance().viewRootNames.first()

        }

        return activityViewRootId

    }

}