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

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

Merge "Revert "audio AIDL: Consider `BUS` devices as attached"" into main am:... 

Merge "Revert "audio AIDL: Consider `BUS` devices as attached"" into main am: 29ab2255 am: a32c35d6 am: 95a74c3b am: 04333d4a am: 38abecbe

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



Change-Id: I132481565e01c28a76001ca56f02e72ed46abbcb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3059b768 38abecbe

media/audioaidlconversion/AidlConversionCppNdk.cpp

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
                GET_DEVICE_DESC_CONNECTION(IP_V4));

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_BUS, AUDIO_DEVICE_OUT_BUS,

                AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE);

                AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE,

                GET_DEVICE_DESC_CONNECTION(BUS));

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_PROXY, AUDIO_DEVICE_OUT_PROXY,

                AudioDeviceType::IN_AFE_PROXY, AudioDeviceType::OUT_AFE_PROXY);