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

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

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

Merge "audio AIDL: Consider `BUS` devices as attached" into main am: ed2bb86b am: fb6780b7 am: d93c6a00

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



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

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ 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,

                GET_DEVICE_DESC_CONNECTION(BUS));

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