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
diff --git a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
index 2f1282a..5d06cb6 100644
--- a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
+++ b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
@@ -184,15 +184,9 @@
// '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