Fix setup for test CarAppFocusManagerTest (the other ones)

The test setup was using a async call that would not finish before the first
assert. This will not block until the test environment is ready.

Bug:79152037

Test: run the test
Change-Id: I3914769b437e44e31b7799c7d28a9a7c5d440bbb

1 files changed, 9 insertions, 3 deletions

diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
index 31670a0ebb..2d58e563a2 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
@@ -36,10 +36,16 @@ public class CarAppFocusManagerTest extends CarApiTestBase {
 
         // Request all application focuses and abandon them to ensure no active context is present
         // when test starts.
+        int[] activeTypes =  {CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND};
         FocusOwnershipCallback owner = new FocusOwnershipCallback();
-        mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner);
-        mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, owner);
-        mManager.abandonAppFocus(owner);
+        for (int i = 0; i < activeTypes.length; i++) {
+            mManager.requestAppFocus(activeTypes[i], owner);
+            owner.waitForOwnershipGrantAndAssert(DEFAULT_WAIT_TIMEOUT_MS, activeTypes[i]);
+            mManager.abandonAppFocus(owner, activeTypes[i]);
+            owner.waitForOwnershipLossAndAssert(
+                    DEFAULT_WAIT_TIMEOUT_MS, activeTypes[i]);
+        }
     }
 
     public void testSetActiveNullListener() throws Exception {