From 819d7406acc2b9c3ccf8e4a16c67f2d605017620 Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Wed, 3 Apr 2019 17:59:07 -0700
Subject: [PATCH] Test flaky test: Always wait for handle task to complete

- Previous logic of checking queue to wait or not has race as queue can be
  emptied while posted task is not complete.
- Do not check queue and always wait for new post to complete.

Bug: 129896850
Test: Run the test many times
Change-Id: Ie0e4447cf997cbe343c7e00a8dfd0757b061b547
---
 .../src/com/android/server/am/UserControllerTest.java          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
index 46d076184eefd..231025c61c8a9 100644
--- 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(() -> {