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
This commit is contained in:
Mikhail Naganov
2023-10-13 23:38:25 +00:00
committed by Gerrit Code Review
parent ea604d50de
commit 567d0de485

View File

@@ -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