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

Commit 25917971 authored by Ray Chin's avatar Ray Chin Committed by Automerger Merge Worker
Browse files

Fix load vts configuration error am: 665b9969 am: a20f0dc9 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3196518



Change-Id: Ie2f190137d0aa38a0264da85071e3b469f47d373
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6e3085e a20f0dc9

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