Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev am: 8c5166b2f5
am: eb4b61958e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15223272 Change-Id: Id48b51227ea17fea5c7921fc0e4925075e22e110
This commit is contained in:
commit
f654cb4b80
2 changed files with 1 additions and 10 deletions
|
@ -225,14 +225,6 @@ 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_";
|
||||
|
|
|
@ -710,8 +710,7 @@ 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::isEchoReferenceDevice(maybeSourceAddress.value().deviceType));
|
||||
!xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType);
|
||||
}
|
||||
|
||||
void createPatchIfNeeded() {
|
||||
|
|
Loading…
Reference in a new issue