Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 665b9969 authored by Ray Chin's avatar Ray Chin
Browse files

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
parent 9cf7c9f1

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,9 +32,10 @@ namespace { 
bool initConfiguration() {

bool initConfiguration() {

    std::array<char, PROPERTY_VALUE_MAX> variant;

    std::array<char, PROPERTY_VALUE_MAX> variant;

    property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), "");

    property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), "");

    string variantString = variant.data();

    string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1";

    string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1";

    if (variant.size() != 0) {

    if (variantString.length() != 0) {

        configFilePath = configFilePath + "."  + variant.data();

        configFilePath = configFilePath + "." + variantString;

    }

    }

    configFilePath = configFilePath + ".xml";

    configFilePath = configFilePath + ".xml";

    TunerTestingConfigAidlReader1_0::setConfigFilePath(configFilePath);

    TunerTestingConfigAidlReader1_0::setConfigFilePath(configFilePath);