Revert "audio: Use hardcoded r_submix configuration with XML" am: 567d0de485 am: a37a4feed2

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

Change-Id: Ic0c09527c9284811ada3c1b28adb2431b43ebadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov 2023-10-14 00:11:31 +00:00 committed by Automerger Merge Worker
commit 3727401bcb

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