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

Commit 3d575cac authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

audio: Preserve 'usecase' for in IModule::setAudioPortConfig am: b06a492b 

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



Change-Id: Id74c665a92bfdac50357519ee2e45ac6ca03eeb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4717a22f b06a492b

audio/aidl/default/Module.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1169,9 +1169,12 @@ ndk::ScopedAStatus Module::setAudioPortConfigImpl( 
    if (in_requested.ext.getTag() != AudioPortExt::Tag::unspecified) {

        if (in_requested.ext.getTag() == out_suggested->ext.getTag()) {

            if (out_suggested->ext.getTag() == AudioPortExt::Tag::mix) {

                // 'AudioMixPortExt.handle' is set by the client, copy from in_requested

                out_suggested->ext.get<AudioPortExt::Tag::mix>().handle =

                        in_requested.ext.get<AudioPortExt::Tag::mix>().handle;

                // 'AudioMixPortExt.handle' and '.usecase' are set by the client,

                // copy from in_requested.

                const auto& src = in_requested.ext.get<AudioPortExt::Tag::mix>();

                auto& dst = out_suggested->ext.get<AudioPortExt::Tag::mix>();

                dst.handle = src.handle;

                dst.usecase = src.usecase;

            }

        } else {

            LOG(WARNING) << __func__ << ": requested ext tag "