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

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

Merge "media: Add connection types for Proxy devices" into main am: 72585d21... 

Merge "media: Add connection types for Proxy devices" into main am: 72585d21 am: 229cc0e8 am: d6f45f50

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



Change-Id: Ic83ff4149c26c93b4d740a764e89dbe5fd497b79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7ba78b9 d6f45f50

media/audioaidlconversion/AidlConversionCppNdk.cpp

+2 −1
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
                AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE);

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_PROXY, AUDIO_DEVICE_OUT_PROXY,

                AudioDeviceType::IN_AFE_PROXY, AudioDeviceType::OUT_AFE_PROXY);

                AudioDeviceType::IN_AFE_PROXY, AudioDeviceType::OUT_AFE_PROXY,

                GET_DEVICE_DESC_CONNECTION(VIRTUAL));

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_OUT_USB_HEADSET,

                AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET,