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

Commit 8558a337 authored by wenyu zhang's avatar wenyu zhang Committed by Wenyu Zhang
Browse files

Reuse getDevicesForAttributes for get input devices 

Change-Id: Ib467fcdf3aa1ae5cb71375c773bfda09c89e669c
Bug: b/364923030, b/357122624
Flag: com.android.media.audioserver.enable_audio_input_device_routing
parent f2e8d6a7

media/audio/aconfig/audioserver.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ flag { 
    bug: "342413767"

}



flag {

    name: "enable_audio_input_device_routing"

    namespace: "media_audio"

    description: "Allow audio input devices routing control."

    bug: "364923030"

}



flag {

    name: "fdtostring_timeout_fix"

    namespace: "media_audio"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+16 −0
Original line number Diff line number Diff line
@@ -9047,6 +9047,13 @@ sp<SwAudioOutputDescriptor> AudioPolicyManager::openOutputWithProfileAndDevice( 


status_t AudioPolicyManager::getDevicesForAttributes(

        const audio_attributes_t &attr, DeviceVector &devices, bool forVolume) {

    // attr containing source set by AudioAttributes.Builder.setCapturePreset() has precedence

    // over any usage or content type also present in attr.

    if (com::android::media::audioserver::enable_audio_input_device_routing() &&

        attr.source != AUDIO_SOURCE_INVALID) {

        return getInputDevicesForAttributes(attr, devices);

    }



    // Devices are determined in the following precedence:

    //

    // 1) Devices associated with a dynamic policy matching the attributes.  This is often
@@ -9110,6 +9117,15 @@ status_t AudioPolicyManager::getDevicesForAttributes( 
    return NO_ERROR;

}



status_t AudioPolicyManager::getInputDevicesForAttributes(

        const audio_attributes_t &attr, DeviceVector &devices) {

    devices = DeviceVector(

            mEngine->getInputDeviceForAttributes(attr, 0 /*uid unknown here*/,

                                                 AUDIO_SESSION_NONE,

                                                 nullptr /* mix */));

    return NO_ERROR;

}



status_t AudioPolicyManager::getProfilesForDevices(const DeviceVector& devices,

                                                   AudioProfileVector& audioProfiles,

                                                   uint32_t flags,

services/audiopolicy/managerdefault/AudioPolicyManager.h

+5 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,11 @@ private: 
                                         DeviceVector &devices,

                                         bool forVolume);



        // A helper method used by getDevicesForAttributes to retrieve input devices when

        // capture preset is available in the given audio attributes parameter.

        status_t getInputDevicesForAttributes(const audio_attributes_t &attr,

                                              DeviceVector &devices);



        status_t getProfilesForDevices(const DeviceVector& devices,

                                       AudioProfileVector& audioProfiles,

                                       uint32_t flags,