Merge "audio: exclude the echo reference device in capture position test" into sc-dev
diff --git a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h
index a92a277..79243b6 100644
--- a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h
+++ b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h
@@ -225,6 +225,14 @@
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_";
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 0b3098b..79ac295 100644
--- a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp
+++ b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp
@@ -710,7 +710,8 @@
// 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() {