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

Commit a32c35d6 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: 29ab2255 

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



Change-Id: Idf647d714d7b45505b1abaafb60424a4c6ab92a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf7e9b32 29ab2255

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);