| commit | 6268b8039234a77b8b24862142801b092620bb52 | [log] [tgz] |
|---|---|---|
| author | Ray Chin <raychin@google.com> | Mon Jul 29 00:03:36 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 29 00:03:36 2024 +0000 |
| tree | e4d8a2c6f0aaf99cb1643630e59a25964432fe38 | |
| parent | 3935a3fa5de8e00a7f5ca3360c2bf09d07126d52 [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: I5b716362778dec9c606d1093aa652188d5d28076 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);