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

Commit b9b5f833 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda... 

Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda am: 5417f105 am: 45dfe4ef

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



Change-Id: I7d288d92ba0c4260c045448887798b8dc9499f33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9457d84 45dfe4ef

audio/aidl/default/AudioPolicyConfigXmlConverter.cpp

+8 −2
Original line number Diff line number Diff line
@@ -184,9 +184,15 @@ 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