Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc72370 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "audio: exclude the echo reference device in capture position... 

Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev am: 8c5166b2

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

Change-Id: Ib804bd3a80ad13899e74e2e65f2271296ab79b5a
parents 629f296e 8c5166b2

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+0 −8
Original line number Diff line number Diff line
@@ -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_";

audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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() {