| commit | c14165fa4442ba83d5a83d10a372a76d05bbbc19 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jul 07 18:57:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 07 18:57:09 2021 +0000 |
| tree | ae2103a18dd9cdede1207fbd89e4d100691a0bdb | |
| parent | 5b9dbab8507a1b6f35c515a8b4a2e6c502a2d6af [diff] | |
| parent | 9cc7237076240574db15239aab4c763dceccc178 [diff] |
Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev am: 8c5166b2f5 am: 9cc7237076 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15223272 Change-Id: I5c2d59f13f5d3945824e4bf672181303f37f9482
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 79243b6..a92a277 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,14 +225,6 @@ 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 79ac295..0b3098b 100644 --- a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp
@@ -710,8 +710,7 @@ // 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::isEchoReferenceDevice(maybeSourceAddress.value().deviceType)); + !xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType); } void createPatchIfNeeded() {