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

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

Support product specific VTS test configuration am: 7d03f498 am: abad8696 

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



Change-Id: I02a04eba7f1a1413981a79016c191b4a474cbac8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08db3a24 abad8696

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

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



#include <android/binder_manager.h>

#include <cutils/properties.h>



#include "DemuxTests.h"

#include "DescramblerTests.h"
@@ -29,6 +30,17 @@ using android::sp; 
namespace {



bool initConfiguration() {

    std::array<char, PROPERTY_VALUE_MAX> 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;

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

+0 −2
Original line number Diff line number Diff line
@@ -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