commit 6851adba7a6e8543638c69224bad73355d858c9f
author Cheney Ni <cheneyni@google.com> Thu Nov 01 06:30:37 2018 +0800
committer Hansong Zhang <hsz@google.com> Wed Feb 06 15:21:08 2019 -0800
tree 81d20756ad54cc11318c3bddc01befa4a1a1c465
parent 4ae8b0c37c4b9852c15098cc5ba4129745d1d07b

Introduce a new Audio HW module: bluetooth_audio

When persist.bluetooth.bluetooth_audio_hal.enabled is true, the audio
server will load audio_policy_configuration_bluetooth_hal_enabled.xml
to enable BluetoothAudio HAL 2.0

Bug: 111519504
Bug: 121411420
Bug: 122556667
Test: manual

Change-Id: I52df919be8525aa58384163e9505c02a52773506

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 15e2c36..c87b2ed 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -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,7 +3910,11 @@
     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
-        fileNames.push_back(AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME);
+        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);