commit e6c80028afd1ea2e40d69564231b141dd938139e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 29 02:56:21 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 29 02:56:21 2022 +0000
tree 42ce10bc804d4c35e445f962dabf9dc9dfa7f200
parent 88b7c10cd82806b1fb07e79ec7b2cffc4dd8753d
parent 9ea484ffc055d8aaabcb1bf393099fbdc65e4046

Merge "In supplicant VTS test setup, make sure that the wifi hal is stopped before starting wifi." into android12-tests-dev

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) {