From 665b996908c4c5d6d1fdee8b73658fe615820a73 Mon Sep 17 00:00:00 2001
From: Ray Chin <raychin@google.com>
Date: Sat, 27 Jul 2024 07:07:50 +0800
Subject: [PATCH] Fix load vts configuration error

The array has static size. It will always return the same value no
matter it read something from the vendor property or not. Change to
check the string length can fix this issue.

Bug: 355329871
Test: cf_x86_tv
Change-Id: I37abd66fbc973c454b6ae72ecdab70c13581a13f
---
 tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
index 6cabb3d8d7..be9b9969a3 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
@@ -32,9 +32,10 @@ namespace {
 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);