Merge "Fix tunerhal vts feId uninitialized on getFrontendIdByType" into android11-tests-dev am: 40087f64c5

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

Change-Id: I5984bcb9f4ba77cdd3deba87beaea43aaedd3a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Henry Fang
2022-10-25 17:05:55 +00:00
committed by Automerger Merge Worker

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

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