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

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

Merge "audio VTS: Use 'IN_DEFAULT' device type for telephony" am: 5e01ce4c... 

Merge "audio VTS: Use 'IN_DEFAULT' device type for telephony" am: 5e01ce4c am: 99ae125b am: c393ba26

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2322453



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

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

+2 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,8 @@ class InputStreamTest 
        if (!xsd::isTelephonyDevice(address.deviceType)) {

            metadata.source = toString(xsd::AudioSource::AUDIO_SOURCE_UNPROCESSED);

            metadata.channelMask = getConfig().base.channelMask;

        } else {

            address.deviceType = toString(xsd::AudioDevice::AUDIO_DEVICE_IN_DEFAULT);

        }

#if MAJOR_VERSION == 7 && MINOR_VERSION >= 1

        auto flagsIt = std::find(flags.begin(), flags.end(),