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

Commit 65394172 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix MotionToolLib race condition in Tests" into tm-qpr-dev am: bcea9cc0 am: 8ca1656b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/20568653



Change-Id: I65991e2f4902b877ff9f7016759e4bffd252fb62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61865e39 8ca1656b

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

    }

}