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

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

Merge "Fix crash of test after finishing RecentsAnimationTest" into qt-dev

parents e252d155 e2e5ee1c
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -585,7 +585,10 @@ class ActivityTestsBase {
        }

        void tearDown() {
            mHandlerThread.quitSafely();
            // Make sure there are no running messages and then quit the thread so the next test
            // won't be affected.
            mHandlerThread.getThreadHandler().runWithScissors(mHandlerThread::quit,
                    0 /* timeout */);
        }
    }

@@ -630,7 +633,8 @@ class ActivityTestsBase {
            mWindowManager = prepareMockWindowManager();
            mKeyguardController = mock(KeyguardController.class);

            // Do not schedule idle timeouts
            // Do not schedule idle that may touch methods outside the scope of the test.
            doNothing().when(this).scheduleIdleLocked();
            doNothing().when(this).scheduleIdleTimeoutLocked(any());
            // unit test version does not handle launch wake lock
            doNothing().when(this).acquireLaunchWakelock();