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

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

Merge "Adjust after "bus" device type change" into main am: 6e635c96 

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



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

media/audioaidlconversion/AidlConversionCppNdk.cpp

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

                AudioDeviceType::IN_BUS, AudioDeviceType::OUT_BUS);

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_PROXY, AUDIO_DEVICE_OUT_PROXY,

                AudioDeviceType::IN_AFE_PROXY, AudioDeviceType::OUT_AFE_PROXY,