commit b36f670c2fb9754bb93b7b7e64984092e9decf77
author Riddle Hsu <riddlehsu@google.com> Tue Jun 11 22:02:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 11 22:02:31 2019 -0700
tree 27bf339ed479f3f91f075868286d59441149edec
parent 02f4c4062358d14889817b189e28a4dae96eeae0
parent 0f106257908cc42e763fcbbeda588cba06dda526

Merge "Fix crash of test after finishing RecentsAnimationTest" into qt-dev
am: 0f10625790

Change-Id: Ifaad6ef5890dadce259e28ea4681fd6cb160dd55

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

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
index 53b0add..4986a6d 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
@@ -585,7 +585,10 @@
         }
 
         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 @@
             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();