Revert "Revert "Fix audio VTS build""

This reverts commit 6735fea712.

Test: make.
This commit is contained in:
Eric Laurent
2019-02-22 18:18:55 -08:00
parent d58e09e368
commit bfb49a5cb0

View File

@@ -142,14 +142,13 @@ struct PolicyConfigData {
android::DeviceVector availableOutputDevices;
android::DeviceVector availableInputDevices;
sp<android::DeviceDescriptor> defaultOutputDevice;
android::VolumeCurvesCollection volumes;
};
class PolicyConfig : private PolicyConfigData, public AudioPolicyConfig {
public:
PolicyConfig()
: AudioPolicyConfig(hwModules, availableOutputDevices, availableInputDevices,
defaultOutputDevice, &volumes) {
defaultOutputDevice) {
for (const char* location : kConfigLocations) {
std::string path = std::string(location) + '/' + kConfigFileName;
if (access(path.c_str(), F_OK) == 0) {