commit | 7ba3d1c3ad2ab736078f965df65da7989140a546 | [log] [tgz] |
---|---|---|
author | Mikhail Naganov <mnaganov@google.com> | Wed Jan 25 20:38:03 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 20:38:03 2023 +0000 |
tree | 594b10c0ca8c676be2bee7dfb850d3bf56d989d4 | |
parent | a613b2e812e1bd95cb3ed99e3070b3806e01c24f [diff] | |
parent | ed51d1084015982c6d5c50d4a0595928339af959 [diff] |
audio VTS: Use the right device type in PcmOnlyConfigInputStreamTest am: 6de19308ab am: b7e3b73036 am: ed51d10840 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2367469 Change-Id: Ie77e0a69b431a5e619a9f6abb532806917701132 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 505c54c..95564e0 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()) {