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

Commit 5dd31300 authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

Merge "Introduce a new Audio HW module: bluetooth_audio" am: 6b890b0b 

am: 1d2eedd9

Change-Id: Ife89c3c8e2656459af58b2b8d9f06bc76cfec026
parents f122c308 1d2eedd9

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+7 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define AUDIO_POLICY_XML_CONFIG_FILE_NAME "audio_policy_configuration.xml"

#define AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME \

        "audio_policy_configuration_a2dp_offload_disabled.xml"

#define AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME \

        "audio_policy_configuration_bluetooth_hal_enabled.xml"



#include <inttypes.h>

#include <math.h>
@@ -3908,8 +3910,12 @@ static status_t deserializeAudioPolicyXmlConfig(AudioPolicyConfig &config) { 
    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 {

            fileNames.push_back(AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME);

        }

    }

    fileNames.push_back(AUDIO_POLICY_XML_CONFIG_FILE_NAME);



    for (const char* fileName : fileNames) {