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

Commit 33ba6894 authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta Committed by Automerger Merge Worker
Browse files

Merge "Remote Submix Out is not a permanently attached device, and thus... 

Merge "Remote Submix Out is not a permanently attached device, and thus requires a non-empty string for its connection." am: c3c62a1e am: 6ece4d97

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2393575



Change-Id: If0e6e22ff0b42a11ccf3f46bca40f3ca451aef67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b99f2de3 6ece4d97

media/audioaidlconversion/AidlConversionCppNdk.cpp

+9 −3
Original line number Diff line number Diff line
@@ -477,6 +477,15 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
            {

                AUDIO_DEVICE_IN_ECHO_REFERENCE, make_AudioDeviceDescription(

                        AudioDeviceType::IN_ECHO_REFERENCE)

            },

            {

                AUDIO_DEVICE_IN_REMOTE_SUBMIX, make_AudioDeviceDescription(

                         AudioDeviceType::IN_SUBMIX)

            },

            {

                AUDIO_DEVICE_OUT_REMOTE_SUBMIX, make_AudioDeviceDescription(

                        AudioDeviceType::OUT_SUBMIX,

                        GET_DEVICE_DESC_CONNECTION(VIRTUAL))

            }

        }};

        append_AudioDeviceDescription(pairs,
@@ -494,9 +503,6 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
                AUDIO_DEVICE_IN_HDMI, AUDIO_DEVICE_OUT_HDMI,

                AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE,

                GET_DEVICE_DESC_CONNECTION(HDMI));

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX,

                AudioDeviceType::IN_SUBMIX, AudioDeviceType::OUT_SUBMIX);

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET, AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET,

                AudioDeviceType::IN_DOCK, AudioDeviceType::OUT_DOCK,