| commit | c19ec42e426102a94e65d21eb2d758b1b1aa3e11 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Thu Dec 22 05:19:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 22 05:19:44 2022 +0000 |
| tree | dbfd53d40922d3c87cd14986f87de6741c51b6fa | |
| parent | 653fc5a29b5271fd7188add3926f1b92d394f550 [diff] | |
| parent | 7f48679f48142bb3ef9f0f03ab4ff55ba72f234c [diff] |
Merge "audio VTS: Use the right device type in PcmOnlyConfigInputStreamTest" am: b9807ec2b1 am: aa26732dcc am: 7f48679f48 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2366930 Change-Id: Ic98bdc4e462e33dee33906f8204b7dacd2c86998 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp index 719f752..c4c18a4 100644 --- a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp
@@ -687,7 +687,12 @@ InputStreamTest::TearDown(); } - bool canQueryCapturePosition() const { return !xsd::isTelephonyDevice(address.deviceType); } + bool canQueryCapturePosition() const { + // See b/263305254 and b/259636577. Must use the device initially passed in + // as a parameter, not 'address' which gets adjusted during test setup for + // the telephony case. + return !xsd::isTelephonyDevice(getAttachedDeviceAddress().deviceType); + } void createPatchIfNeeded() { if (areAudioPatchesSupported()) {