From 715b8ec2c58a1109d091bc2d34188c1b18fa5829 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Wed, 30 Nov 2022 00:54:22 +0000 Subject: [PATCH] audio VTS: Use 'IN_DEFAULT' device type for telephony This undoes the change which had happened unintentionally in https://cs.android.com/android/_/android/platform/hardware/ \ interfaces/+/1e703f182e2fcbb9123bf661d81d22a04d0e1f8d The device type passed to 'openInputStream' for telephony devices should be 'AUDIO_DEVICE_IN_DEFAULT' Bug: 259636577 Test: atest VtsHalAudioV7_0TargetTest Test: atest VtsHalAudioV7_1TargetTest Change-Id: Ic8f4367961346b87087c885a3cdaccab3c1407c9 (cherry picked from commit d72b42d7696525ca936e9c96184c37635f83f83e) --- .../core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h index 0ca6a58f06..98e49a214f 100644 --- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h +++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h @@ -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(),