From 7d03f49853dca617b18a0570ddd28d76d2ce24b7 Mon Sep 17 00:00:00 2001 From: Ray Chin Date: Fri, 29 Mar 2024 11:07:37 +0800 Subject: [PATCH] Support product specific VTS test configuration The tuner vts will read the system property ro.vendor.vts_tuner_configuration_variant as the suffix of the config file to read. Vendor who wants to support multiple region for a single SoC need to put all VTS config with different suffix as /vendor/etc/tuner_vts_config_aidl_V1.{suffix}.xml on device. Bug: 322899156 Test: atest VtsHalTvTunerTargetTest Change-Id: I1f76d700671c07bc90965fba94f96b8be47198d7 --- .../aidl/vts/functional/VtsHalTvTunerTargetTest.h | 12 ++++++++++++ .../vts/functional/VtsHalTvTunerTestConfigurations.h | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h index 8ad6ee0d43..491a79b5a4 100644 --- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h +++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h @@ -17,6 +17,7 @@ #pragma once #include +#include #include "DemuxTests.h" #include "DescramblerTests.h" @@ -29,6 +30,17 @@ using android::sp; namespace { bool initConfiguration() { + std::array variant; + auto res = property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), ""); + if (res <= 0) { + ALOGE("[vts] failed to read system property ro.vendor.vts_tuner_configuration_variant"); + return false; + } + string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1"; + if (variant.size() != 0) { + configFilePath = configFilePath + "." + variant.data(); + } + configFilePath = configFilePath + ".xml"; TunerTestingConfigAidlReader1_0::setConfigFilePath(configFilePath); if (!TunerTestingConfigAidlReader1_0::checkConfigFileExists()) { return false; diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h index ff94639466..29d2f1825f 100644 --- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h +++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h @@ -52,8 +52,6 @@ using namespace android::media::tuner::testing::configuration::V1_0; const int32_t FMQ_SIZE_4M = 0x400000; const int32_t FMQ_SIZE_16M = 0x1000000; -const string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1.xml"; - #define FILTER_MAIN_TYPE_BIT_COUNT 5 #define STATUS_CHECK_INTERVAL_MS 100L