Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e29c6868 authored by Weilin Xu's avatar Weilin Xu Committed by Android (Google) Code Review
Browse files

Merge "Fix race condition in HIDL radio serivce test" into main

parents 042df8f0 bc058763

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/TunerSessionHidlTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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();