From 4703ee1711d1cbb8328557eefefaa19af69535e9 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Mon, 18 Feb 2019 14:34:20 +0800
Subject: [PATCH] sm6225-common: Support A2DP offload for Bluetooth Audio HAL
 V2

Remove primary flags from hearing aid also.

Bug: 124277691
Bug: 124014853
Test: manual with BluetoothAudioHAL enabled / disabled
Change-Id: Ibc86687a6a6c2f0767a213ccd408e7bb5de98985
---
 audio/audio_policy_configuration_vendor.xml   |  4 ++--
 ...hearing_aid_audio_policy_configuration.xml | 20 +++++++++++++++++++
 bengal.mk                                     |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 audio/bluetooth_hearing_aid_audio_policy_configuration.xml

diff --git a/audio/audio_policy_configuration_vendor.xml b/audio/audio_policy_configuration_vendor.xml
index b914ddb..9b3bce5 100644
--- a/audio/audio_policy_configuration_vendor.xml
+++ b/audio/audio_policy_configuration_vendor.xml
@@ -437,8 +437,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <!-- Remote Submix Audio HAL -->
         <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
 
-        <!-- Bluetooth Audio HAL -->
-        <xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/>
+        <!-- Bluetooth Audio HAL for Hearing aid -->
+        <xi:include href="/vendor/etc/bluetooth_hearing_aid_audio_policy_configuration.xml"/>
 
     </modules>
     <!-- End of Modules section -->
diff --git a/audio/bluetooth_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
new file mode 100644
index 0000000..7dcabf7
--- /dev/null
+++ b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
+<module name="bluetooth" halVersion="2.0">
+    <mixPorts>
+        <!-- Hearing AIDs Audio Ports -->
+        <mixPort name="hearing aid output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="24000,16000"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <!-- Hearing AIDs Audio Ports -->
+        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="BT Hearing Aid Out"
+               sources="hearing aid output"/>
+    </routes>
+</module>
diff --git a/bengal.mk b/bengal.mk
index 90c2799..54840ce 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -79,6 +79,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/audio/audio_policy_configuration_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \
     $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+    $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
     $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
     $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml