| commit | c393ba26425a0e27221b70f95dbe6cbdd6a0f037 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Wed Nov 30 18:13:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 30 18:13:25 2022 +0000 |
| tree | f402582c498783bc7c792ea7424c2626cf9f68dd | |
| parent | 73e349fb15bb10ebc715c170a78612249bcbee77 [diff] | |
| parent | 99ae125b1f1a3ae0b12a48a1e7d9907afa23a4ca [diff] |
Merge "audio VTS: Use 'IN_DEFAULT' device type for telephony" am: 5e01ce4cba am: 99ae125b1f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2322453 Change-Id: I271247491fff50548e0e26f627c5127934123a65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h index 0ca6a58..98e49a2 100644 --- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h +++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
@@ -1274,6 +1274,8 @@ 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(),