Merge "audio: exclude the echo reference device in capture position test" into sc-dev am: 0700d79feb

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

Change-Id: I0719d4c7792e71ee15f95b6413ef1dcd5e93885e
This commit is contained in:
Carter Hsu
2021-07-01 09:40:18 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 1 deletions

View File

@@ -225,6 +225,14 @@ static inline bool isTelephonyDevice(const std::string& device) {
return isTelephonyDevice(stringToAudioDevice(device));
}
static inline bool isEchoReferenceDevice(AudioDevice device) {
return device == AudioDevice::AUDIO_DEVICE_IN_ECHO_REFERENCE;
}
static inline bool isEchoReferenceDevice(const std::string& device) {
return isEchoReferenceDevice(stringToAudioDevice(device));
}
static inline bool maybeVendorExtension(const std::string& s) {
// Only checks whether the string starts with the "vendor prefix".
static const std::string vendorPrefix = "VX_";

View File

@@ -710,7 +710,8 @@ class PcmOnlyConfigInputStreamTest : public InputStreamTest {
// Returning 'true' when no source is found so the test can fail later with a more clear
// problem description.
return !maybeSourceAddress.has_value() ||
!xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType);
!(xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType) ||
xsd::isEchoReferenceDevice(maybeSourceAddress.value().deviceType));
}
void createPatchIfNeeded() {