commit b7e3b73036bf4a3af9f92047b552b9a3dcad031a
author Mikhail Naganov <mnaganov@google.com> Wed Jan 25 18:45:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 25 18:45:07 2023 +0000
tree 52664912c5723203825b704b5fb95debf97ed36f
parent b536f21f4cb7775a615b15ac68ee97bc60417e08
parent 6de19308abf263b3510141c5c6e777e4f3e528b6

audio VTS: Use the right device type in PcmOnlyConfigInputStreamTest am: 6de19308ab

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2367469

Change-Id: I29438dd0a094d52305d4466367400cd4d5e03b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp

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()) {