[conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799ad9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2003730

Change-Id: I5993b88b7d0831c9b95adfc50ebe501215f40498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-18 01:24:51 +00:00
committed by Henry Fang

17
tv/tuner/1.0/vts/functional/FrontendTests.cpp Executable file → Normal file
View File

@@ -417,15 +417,18 @@ AssertionResult FrontendTests::closeFrontend() {
void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) {
ASSERT_TRUE(getFrontendIds());
for (size_t i = 0; i < mFeIds.size(); i++) {
ASSERT_TRUE(getFrontendInfo(mFeIds[i]));
if (mFrontendInfo.type != feType) {
continue;
if (mFeIds.size() > 0) {
for (size_t i = 0; i < mFeIds.size(); i++) {
ASSERT_TRUE(getFrontendInfo(mFeIds[i]));
if (mFrontendInfo.type != feType) {
continue;
}
feId = mFeIds[i];
return;
}
feId = mFeIds[i];
return;
} else {
feId = INVALID_ID;
}
feId = INVALID_ID;
}
void FrontendTests::tuneTest(FrontendConfig frontendConf) {