commit ba65d8a94831e33381f75b6d40baee57d55fe9db
author Mikhail Naganov <mnaganov@google.com> Mon May 08 13:14:59 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue May 09 16:00:54 2023 +0000
tree b9ff9b202e0b25d3d32aab76799e913eb8f2ccd3
parent 194757d25f06bfaa6aec31f95db453d1b7c0fb3c

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
(cherry picked from https://android-review.googlesource.com/q/commit:a273cdde847a627465458f971f88fa9ce07d4731)
Merged-In: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68
Change-Id: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68

audio/core/all-versions/vts/functional/7.0/PolicyConfig.h

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 c1d5669..f6271ff 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 @@
 
 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();
     }