commit 0931592367667c79ab5b35c0bf08c25aad3496bf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 29 09:06:38 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 29 09:06:38 2024 +0000
tree 2b61ea01b2a7bd274d2eea43071c89fe23970f94
parent 6268b8039234a77b8b24862142801b092620bb52
parent 767222af54709f773b70129da653ee167123ff84

Merge "Optimize matching logic for multiple requirements at once." into main

tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h

diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
index 6cabb3d..be9b996 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
@@ -32,9 +32,10 @@
 bool initConfiguration() {
     std::array<char, PROPERTY_VALUE_MAX> variant;
     property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), "");
+    string variantString = variant.data();
     string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1";
-    if (variant.size() != 0) {
-        configFilePath = configFilePath + "."  + variant.data();
+    if (variantString.length() != 0) {
+        configFilePath = configFilePath + "." + variantString;
     }
     configFilePath = configFilePath + ".xml";
     TunerTestingConfigAidlReader1_0::setConfigFilePath(configFilePath);