| commit | 7f48679f48142bb3ef9f0f03ab4ff55ba72f234c | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Thu Dec 22 04:41:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 22 04:41:35 2022 +0000 |
| tree | 76fd010ac04552ab8d1b7ce195aa7d0dec59f420 | |
| parent | c2e86010b51c436db0da001a6364ebcbcabc8d1a [diff] | |
| parent | aa26732dcc7d35089b4f503f90a54a96a37e158a [diff] |
Merge "audio VTS: Use the right device type in PcmOnlyConfigInputStreamTest" am: b9807ec2b1 am: aa26732dcc Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2366930 Change-Id: I0742cf6fd4c765936ab2d7eb4695a18e96bd056e 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 55d4e1d..f6440f2 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()) {