From a273cdde847a627465458f971f88fa9ce07d4731 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Mon, 8 May 2023 13:14:59 -0700 Subject: [PATCH] audio VTS: Update 7.0/PolicyConfig The call to instantiate PolicyConfig was updated in Iced9d665d018853c4b2a50f4471a545af7bf60bb, however the version of PolicyConfig class for HIDL HAL 7.x was not updated accordingly Bug: 205884982 Bug: 281450557 Test: atest VtsHalAudioV7_0TargetTest Test: atest HalAudioV7_0GeneratorTest Change-Id: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68 --- .../core/all-versions/vts/functional/7.0/PolicyConfig.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/audio/core/all-versions/vts/functional/7.0/PolicyConfig.h b/audio/core/all-versions/vts/functional/7.0/PolicyConfig.h index c1d5669775..f6271ff3fa 100644 --- a/audio/core/all-versions/vts/functional/7.0/PolicyConfig.h +++ b/audio/core/all-versions/vts/functional/7.0/PolicyConfig.h @@ -41,15 +41,10 @@ using Module = Modules::Module; class PolicyConfig { public: - explicit PolicyConfig(const std::string& configFileName) - : mConfigFileName{configFileName}, - mFilePath{findExistingConfigurationFile(mConfigFileName)}, - mConfig{xsd::read(mFilePath.c_str())} { - init(); - } PolicyConfig(const std::string& configPath, const std::string& configFileName) : mConfigFileName{configFileName}, - mFilePath{configPath + "/" + mConfigFileName}, + mFilePath{configPath.empty() ? findExistingConfigurationFile(mConfigFileName) + : configPath + "/" + mConfigFileName}, mConfig{xsd::read(mFilePath.c_str())} { init(); }