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

Commit 3b565b4e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid unfinished MockitoSession if setUp has errors" into main

parents 7cc25ef1 0d9e49b3

services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -444,7 +444,9 @@ public class SystemServicesTestRule implements TestRule { 
        SurfaceAnimationThread.dispose();

        SurfaceAnimationThread.dispose();

        AnimationThread.dispose();

        AnimationThread.dispose();

        UiThread.dispose();

        UiThread.dispose();

        if (mInputChannel != null) {

            mInputChannel.dispose();

            mInputChannel.dispose();

        }





        tearDownLocalServices();

        tearDownLocalServices();

        // Reset priority booster because animation thread has been changed.

        // Reset priority booster because animation thread has been changed.