Merge "audio VTS: Update 7.0/PolicyConfig" am: 9470948681 am: f29fb96f32 am: 331361212e

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

Change-Id: I05c469434ec8a9241c904c7665bdb0ace9e3fc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-09 11:09:09 +00:00 committed by Automerger Merge Worker
commit 13ec38a16d

View file

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