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

Commit dd17c17c authored by Petri Gynther's avatar Petri Gynther Committed by android-build-merger
Browse files

Merge "audiopolicy: Add support for A2DP offload audio policy config" into pi-dev 

am: 40ed7728

Change-Id: Ida6577992262b21b5b41536bf94d7e08e51ad4c2
parents 5c47d868 40ed7728

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#define AUDIO_POLICY_XML_CONFIG_FILE_PATH_MAX_LENGTH 128

#define AUDIO_POLICY_XML_CONFIG_FILE_NAME "audio_policy_configuration.xml"

#define AUDIO_POLICY_A2DP_OFFLOAD_XML_CONFIG_FILE_NAME "audio_policy_a2dp_offload_configuration.xml"



#include <inttypes.h>

#include <math.h>
@@ -3517,10 +3518,13 @@ static status_t deserializeAudioPolicyXmlConfig(AudioPolicyConfig &config) { 


    for (int i = 0; i < kConfigLocationListSize; i++) {

        PolicySerializer serializer;

        bool use_a2dp_offload_config =

                 property_get_bool("persist.bluetooth.a2dp_offload.enable", false);

        snprintf(audioPolicyXmlConfigFile,

                 sizeof(audioPolicyXmlConfigFile),

                 "%s/%s",

                 kConfigLocationList[i],

                 use_a2dp_offload_config ? AUDIO_POLICY_A2DP_OFFLOAD_XML_CONFIG_FILE_NAME :

                     AUDIO_POLICY_XML_CONFIG_FILE_NAME);

        ret = serializer.deserialize(audioPolicyXmlConfigFile, config);

        if (ret == NO_ERROR) {