| commit | 0b22c985be400c5f04cdf4341c6e501d73e351cf | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Tue May 09 18:24:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 09 18:24:41 2023 +0000 |
| tree | b9ff9b202e0b25d3d32aab76799e913eb8f2ccd3 | |
| parent | cb6330c1ec03fffa7378135b788779d1fdc25440 [diff] | |
| parent | ba65d8a94831e33381f75b6d40baee57d55fe9db [diff] |
audio VTS: Update 7.0/PolicyConfig am: ba65d8a948 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23112897 Change-Id: Ia23077cb694a694604e107ecf4f828d125b57ce6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); }