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

Commit 06dc621b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Revert "audio: Use hardcoded r_submix configuration with XML" am: 567d0de4... 

Revert "audio: Use hardcoded r_submix configuration with XML" am: 567d0de4 am: a37a4fee am: 3727401b

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



Change-Id: I080214e99acae9276c5662e4ccbe93a7a17f9848
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eeb4d30c 3727401b

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