summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Weilin Xu <xuweilin@google.com> 2023-10-08 20:09:49 -0700
committer Weilin Xu <xuweilin@google.com> 2023-10-09 17:27:26 +0000
commitbc058763f8261079c2ddc8e8bb3d6fcd3ecbe8ac (patch)
tree9a732947046161f16ca532da8a38fc076a6e90ad
parent815e0363e57bf2307388a3d0d487e5ec8998bd94 (diff)
Fix race condition in HIDL radio serivce test
Fixed the race condition between receiving onCurrentProgramInfoChanged callback and updating mocked isCurrentOrSystemUser method called from onCurrentProgramInfoChanged in cancel_forNonCurrentUser_doesNotCance for HIDL HAL broadcast radio service tuner session unit test, Bug: 302236983 Test: atest com.android.server.broadcastradio.hal2 Change-Id: I9218a611c57f6de2733b3e42e7bab935a5aa728c
-rw-r--r--core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java
index 3b9d7ba5de3e..3ec44d14b409 100644
--- a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java
+++ b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java
@@ -553,6 +553,7 @@ public final class TunerSessionHidlTest extends ExtendedRadioMockitoTestCase {
openAidlClients(/* numClients= */ 1);
ProgramSelector initialSel = TestUtils.makeFmSelector(AM_FM_FREQUENCY_LIST[1]);
mTunerSessions[0].tune(initialSel);
+ verify(mAidlTunerCallbackMocks[0], CALLBACK_TIMEOUT).onCurrentProgramInfoChanged(any());
doReturn(false).when(() -> RadioServiceUserController.isCurrentOrSystemUser());
mTunerSessions[0].cancel();