| commit | 2636b69192cc13305dffe3efb465278a347df865 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Apr 20 20:33:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 20 20:33:55 2021 +0000 |
| tree | 4cb2f1e1c34da4802a24d3e2f3eedddf88862be0 | |
| parent | 099613d389b453b34c2a4d17e691f6cf09eca450 [diff] | |
| parent | ff43d889e79b965f93af9795842eabbb07cc43a7 [diff] |
Merge "Fix race condition in CARSM unit tests" am: ff43d889e7 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1679712 Change-Id: Id899db8de58fb27dcf3f3cbfe5d77454adde02e8
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