diff options
| author | Hall Liu <hallliu@google.com> | 2021-04-19 15:19:14 -0700 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2021-04-19 15:20:38 -0700 |
| commit | 514e4dbeae1ca7b294ba383089bb4135b8fbeea1 (patch) | |
| tree | 03f87e1de8ec8784db33e7c4660ffac9e4fcb406 /tests/src/com | |
| parent | 0e44b583b0629b3a437fbbd538739f5373f01603 (diff) | |
| download | platform_packages_services_Telecomm-514e4dbeae1ca7b294ba383089bb4135b8fbeea1.tar.gz platform_packages_services_Telecomm-514e4dbeae1ca7b294ba383089bb4135b8fbeea1.tar.bz2 platform_packages_services_Telecomm-514e4dbeae1ca7b294ba383089bb4135b8fbeea1.zip | |
Fix race condition in CARSM unit tests
Fixes: 185703290
Test: atest CallAudioRouteStateMachineTest
Change-Id: I5b2a6d9837c49cdcf7c98657d943380adc98bead
Diffstat (limited to 'tests/src/com')
| -rw-r--r-- | tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java index 5592cf416..976a4dae8 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 @@ public class CallAudioRouteStateMachineTest extends TelecomTestCase { 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 |