Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 044251c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio VTS: Update 7.0/PolicyConfig" am: 94709486 am: f29fb96f am:... 

Merge "audio VTS: Update 7.0/PolicyConfig" am: 94709486 am: f29fb96f am: 33136121 am: 13ec38a1

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



Change-Id: If4ffa4c0460e9d49afd4955ae5f095ce94c4bab4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d4b7846 13ec38a1

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

+2 −7
Original line number Diff line number Diff line
@@ -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();

    }