From 567d0de4853f4d056a728528ea89296ac21c12fe Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 13 Oct 2023 23:38:25 +0000 Subject: [PATCH] Revert "audio: Use hardcoded r_submix configuration with XML" Revert submission 2770886-AidlAudioHalModuleConfig Reason for revert: Breaks BluetoothInstrumentationTests on main downstream Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig Bug: 305291602 Change-Id: I7f51ab94f5d42ac052e9900ddd0cc69a33856820 --- audio/aidl/default/AudioPolicyConfigXmlConverter.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp index 2f1282a306..5d06cb607c 100644 --- a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp +++ b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp @@ -184,15 +184,9 @@ 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"; - 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); - } + mModuleConfigurations->emplace_back( + name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule))); } } } - } // namespace aidl::android::hardware::audio::core::internal