| commit | a20f0dc97a06fc3834bc57a1783381d441870a9b | [log] [tgz] |
|---|---|---|
| author | Ray Chin <raychin@google.com> | Mon Jul 29 00:12:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 29 00:12:02 2024 +0000 |
| tree | 44314d72096785bff3229f2116100272c5cb54c8 | |
| parent | 85f140dc63fb3a76c6d9d2eca5c951f5457ef688 [diff] | |
| parent | 665b996908c4c5d6d1fdee8b73658fe615820a73 [diff] |
Fix load vts configuration error am: 665b996908 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3196518 Change-Id: I9392bbe077f6dfb55a213e0089e4fae2ac3075ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h index 6cabb3d..be9b996 100644 --- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h +++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
@@ -32,9 +32,10 @@ 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);