Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 567d0de4 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

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
parent ea604d50

audio/aidl/default/AudioPolicyConfigXmlConverter.cpp

+2 −8
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }

}



}  // namespace aidl::android::hardware::audio::core::internal