commit 155f20a6cdf3633a1911880094e8d21031899135
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 30 00:18:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 30 00:18:59 2022 +0000
tree ce5d1de0f4c0c10ed140900a917051d8e06447c5
parent 6807799ad9dfffc0538fbcdc80a5e3227fa149f9
parent 42147b7b5b91e294d99ae4bc8fafbc127b0d41d2

Merge "wifi: create interface before running hostapd vts" into android11-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
index 5265f2d..22a4bf9 100644
--- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
@@ -418,16 +418,18 @@
 
 void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) {
     ASSERT_TRUE(getFrontendIds());
-    ASSERT_TRUE(mFeIds.size() > 0);
-    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) {