From bc058763f8261079c2ddc8e8bb3d6fcd3ecbe8ac Mon Sep 17 00:00:00 2001 From: Weilin Xu Date: Sun, 8 Oct 2023 20:09:49 -0700 Subject: 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 --- .../src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java | 1 + 1 file changed, 1 insertion(+) 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(); -- cgit v1.2.3-59-g8ed1b