Merge "Test flaky test: Always wait for handle task to complete"

2019-04-04 16:08:09 +00:00
parent 1e522e456e 819d7406ac
commit 93ceee8684
1 changed files with 0 additions and 3 deletions
--- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
@@ -484,9 +484,6 @@ public class UserControllerTest {

    private void waitForHandlerToComplete(Handler handler, long waitTimeMs)
            throws InterruptedException {
-        if (!handler.hasMessagesOrCallbacks()) { // if nothing queued, do not wait.
-            return;
-        }
        final Object lock = new Object();
        synchronized (lock) {
            handler.post(() -> {