audio: Use hardcoded r_submix configuration with XML am: fc35ca3d32

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

Change-Id: Ieebbe5fe8ca256a02979220bb3ea5b1419b36a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov 2023-10-18 18:20:45 +00:00 committed by Automerger Merge Worker
commit 1e67ba3e09

View file

@ -184,9 +184,15 @@ void AudioPolicyConfigXmlConverter::init() {
// 'primary' in the XML schema used by HIDL is equivalent to 'default' module.
const std::string name =
xsdcModule.getName() != "primary" ? xsdcModule.getName() : "default";
mModuleConfigurations->emplace_back(
name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule)));
if (name != "r_submix") {
mModuleConfigurations->emplace_back(
name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule)));
} else {
// See the note on the 'getRSubmixConfiguration' function.
mModuleConfigurations->emplace_back(name, nullptr);
}
}
}
}
} // namespace aidl::android::hardware::audio::core::internal