commit ff43d889e79b965f93af9795842eabbb07cc43a7
author Hall Liu <hallliu@google.com> Tue Apr 20 20:19:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 20 20:19:16 2021 +0000
tree b79c14150877e49ac70d17a39d4f8f45301bc037
parent 2a81f7cc184d30f291a198617f054db8a352deaf
parent 514e4dbeae1ca7b294ba383089bb4135b8fbeea1

Merge "Fix race condition in CARSM unit tests"

tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java

diff --git a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
index 5592cf4..976a4da 100644
--- a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
@@ -276,6 +276,10 @@
 
         waitForHandlerAction(stateMachine.getHandler(), TEST_TIMEOUT);
         verifyNewSystemCallAudioState(initState, expectedMidState);
+        // clear out the handler state before resetting mocks in order to avoid introducing a
+        // CallAudioState that has a null list of supported BT devices
+        waitForHandlerAction(stateMachine.getHandler(), TEST_TIMEOUT);
+        waitForHandlerAction(stateMachine.getHandler(), TEST_TIMEOUT);
         resetMocks();
 
         // Now, switch back to BT explicitly