Merge "audio VTS: Update 7.0/PolicyConfig" am: 9470948681
am: f29fb96f32
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2582357 Change-Id: I544bf53d6bf6a94e4bd65fd4145107fa5db3fea4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
331361212e
1 changed files with 2 additions and 7 deletions
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue