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

Commit a2be3bea authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use BluetoothAudio HAL 2.0 for Pixel 1, 2"

parents 9c23986e 00ce33d4

services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!-- Hearing aid Audio HAL Audio Policy Configuration file -->

<module name="hearing_aid" halVersion="2.0">

    <mixPorts>

        <mixPort name="hearing aid output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">

        <mixPort name="hearing aid output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="24000,16000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+10 −6
Original line number Diff line number Diff line
@@ -3907,14 +3907,18 @@ static status_t deserializeAudioPolicyXmlConfig(AudioPolicyConfig &config) { 
    std::vector<const char*> fileNames;

    status_t ret;



    if (property_get_bool("ro.bluetooth.a2dp_offload.supported", false) &&

        property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) {

        // A2DP offload supported but disabled: try to use special XML file

        if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.enabled", false)) {

            fileNames.push_back(AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME);

        } else {

    if (property_get_bool("ro.bluetooth.a2dp_offload.supported", false)) {

        if (property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) {

            fileNames.push_back(AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME);

        } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.enabled", false)) {

            // This property persist.bluetooth.bluetooth_audio_hal.enabled is temporary only.

            // xml files AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME, although having

            // the same name, must be different in offload and non offload cases in device

            // specific configuration file.

            fileNames.push_back(AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME);

        }

    } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.enabled", false)) {

        fileNames.push_back(AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME);

    }

    fileNames.push_back(AUDIO_POLICY_XML_CONFIG_FILE_NAME);