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
This commit is contained in:
Ray Chin
2024-07-27 07:07:50 +08:00
parent 9cf7c9f12b
commit 665b996908

View File

@@ -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);