commit 88b7c10cd82806b1fb07e79ec7b2cffc4dd8753d
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jun 18 01:24:51 2022 +0000
committer Henry Fang <quxiangfang@google.com> Wed Jun 22 00:03:16 2022 +0000
tree bcaecb81ea44cc97cb985adf1cca041c1df0ff9d
parent bbecb4563fdd8a0e511a3be9c3312f4c7f033e2a
parent 6807799ad9dfffc0538fbcdc80a5e3227fa149f9

[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>

tv/tuner/1.0/vts/functional/FrontendTests.cpp

diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
old mode 100755
new mode 100644
index b39d922..d0c53dc
--- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
@@ -417,15 +417,18 @@
 
 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) {