Merge "Test empty programInfo update for BroadcastRadio" into tm-dev am: de500a118a am: de4512a0d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17918772 Change-Id: Ia433743c91c29ec361dcc3d937c84ad7c2581dc9 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -166,7 +166,8 @@ public class StartProgramListUpdatesFanoutTest {
|
|||||||
new HashSet<ProgramSelector.Identifier>(), true, false);
|
new HashSet<ProgramSelector.Identifier>(), true, false);
|
||||||
|
|
||||||
// Start updates on the clients in order. The HAL filter should get updated after each
|
// Start updates on the clients in order. The HAL filter should get updated after each
|
||||||
// client except [2].
|
// client except [2]. Client [2] should update received chunk with an empty program
|
||||||
|
// list
|
||||||
mTunerSessions[0].startProgramListUpdates(idFilter);
|
mTunerSessions[0].startProgramListUpdates(idFilter);
|
||||||
ProgramFilter halFilter = Convert.programFilterToHal(idFilter);
|
ProgramFilter halFilter = Convert.programFilterToHal(idFilter);
|
||||||
verify(mHalTunerSessionMock, times(1)).startProgramListUpdates(halFilter);
|
verify(mHalTunerSessionMock, times(1)).startProgramListUpdates(halFilter);
|
||||||
@@ -177,6 +178,9 @@ public class StartProgramListUpdatesFanoutTest {
|
|||||||
|
|
||||||
mTunerSessions[2].startProgramListUpdates(typeFilterWithoutModifications);
|
mTunerSessions[2].startProgramListUpdates(typeFilterWithoutModifications);
|
||||||
verify(mHalTunerSessionMock, times(2)).startProgramListUpdates(any());
|
verify(mHalTunerSessionMock, times(2)).startProgramListUpdates(any());
|
||||||
|
verifyAidlClientReceivedChunk(mAidlTunerCallbackMocks[2], true, Arrays.asList(),
|
||||||
|
null);
|
||||||
|
verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(1)).onProgramListUpdated(any());
|
||||||
|
|
||||||
mTunerSessions[3].startProgramListUpdates(typeFilterWithModifications);
|
mTunerSessions[3].startProgramListUpdates(typeFilterWithModifications);
|
||||||
halFilter.excludeModifications = false;
|
halFilter.excludeModifications = false;
|
||||||
@@ -207,7 +211,7 @@ public class StartProgramListUpdatesFanoutTest {
|
|||||||
updateHalProgramInfo(false, Arrays.asList(mDabEnsembleInfo), null);
|
updateHalProgramInfo(false, Arrays.asList(mDabEnsembleInfo), null);
|
||||||
verify(mAidlTunerCallbackMocks[0], CB_TIMEOUT.times(1)).onProgramListUpdated(any());
|
verify(mAidlTunerCallbackMocks[0], CB_TIMEOUT.times(1)).onProgramListUpdated(any());
|
||||||
verify(mAidlTunerCallbackMocks[1], CB_TIMEOUT.times(2)).onProgramListUpdated(any());
|
verify(mAidlTunerCallbackMocks[1], CB_TIMEOUT.times(2)).onProgramListUpdated(any());
|
||||||
verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(1)).onProgramListUpdated(any());
|
verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(2)).onProgramListUpdated(any());
|
||||||
verify(mAidlTunerCallbackMocks[3], CB_TIMEOUT.times(2)).onProgramListUpdated(any());
|
verify(mAidlTunerCallbackMocks[3], CB_TIMEOUT.times(2)).onProgramListUpdated(any());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user