Loading services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java +6 −2 Original line number Original line Diff line number Diff line Loading @@ -585,7 +585,10 @@ class ActivityTestsBase { } } void tearDown() { 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 */); } } } } Loading Loading @@ -630,7 +633,8 @@ class ActivityTestsBase { mWindowManager = prepareMockWindowManager(); mWindowManager = prepareMockWindowManager(); mKeyguardController = mock(KeyguardController.class); 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()); doNothing().when(this).scheduleIdleTimeoutLocked(any()); // unit test version does not handle launch wake lock // unit test version does not handle launch wake lock doNothing().when(this).acquireLaunchWakelock(); doNothing().when(this).acquireLaunchWakelock(); Loading Loading
services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java +6 −2 Original line number Original line Diff line number Diff line Loading @@ -585,7 +585,10 @@ class ActivityTestsBase { } } void tearDown() { 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 */); } } } } Loading Loading @@ -630,7 +633,8 @@ class ActivityTestsBase { mWindowManager = prepareMockWindowManager(); mWindowManager = prepareMockWindowManager(); mKeyguardController = mock(KeyguardController.class); 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()); doNothing().when(this).scheduleIdleTimeoutLocked(any()); // unit test version does not handle launch wake lock // unit test version does not handle launch wake lock doNothing().when(this).acquireLaunchWakelock(); doNothing().when(this).acquireLaunchWakelock(); Loading