| commit | ebd33b28a39b4c0841f1844fdb3b9317beabbe76 | [log] [tgz] |
|---|---|---|
| author | Carter Hsu <carterhsu@google.com> | Thu Jul 01 09:40:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 09:40:22 2021 +0000 |
| tree | 699019efbb4b6d1cfac15eecc7228f204bccb2db | |
| parent | e171a51b0f57680cd1a5d2e34314b907e7648df4 [diff] | |
| parent | 0700d79feb2a21fe35eb918a5e420f62e8c76f36 [diff] |
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: I6b6b6103d621535a335f9f4ef63442a880c948be
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() {