From 6a462ee6ab2521689e1e302dafb59edc01a09bd3 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Sat, 12 Oct 2019 10:12:37 +0800
Subject: [PATCH] NB1: Enable AOSP bluetooth audio HAL v2

Change-Id: I4d12752ae5fb2829d6612647c8740c84967f5434
---
 configs/audio/audio_policy_configuration.xml |  44 +-----
 proprietary-files.txt                        | 151 -------------------
 2 files changed, 5 insertions(+), 190 deletions(-)

diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index 1711c9737..8a21cbe41 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -255,18 +255,6 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
-                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
                 <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -355,38 +343,13 @@
                        sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
                 <route type="mix" sink="mmap_no_irq_in"
                        sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
-                <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
-                <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
-                <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
 
         </module>
 
-        <!-- A2DP Audio HAL -->
-        <module name="a2dp" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="a2dp input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-
-            <devicePorts>
-                <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </devicePort>
-            </devicePorts>
-
-            <routes>
-                <route type="mix" sink="a2dp input"
-                       sources="BT A2DP In"/>
-            </routes>
-        </module>
+        <!-- A2DP Input Audio HAL -->
+        <xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/>
 
         <!-- Usb Audio HAL -->
         <module name="usb" halVersion="2.0">
@@ -411,6 +374,9 @@
         <!-- 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"/>
+
     </modules>
     <!-- End of Modules section -->
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index bfc5f5165..afd9df81c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -970,154 +970,3 @@ vendor/lib/vendor.qti.hardware.sigma_miracast@1.0.so
 vendor/lib64/libmiracast.so
 vendor/lib64/libwfdhdcpcp.so
 vendor/lib64/vendor.qti.hardware.sigma_miracast@1.0.so
-<<<<<<< HEAD
-=======
-vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
-
-# WiFi
-vendor/bin/cnss-daemon
-vendor/bin/cnss_diag
-vendor/bin/fstman
-vendor/bin/wifilearner
-vendor/bin/wigig_wiburn
-vendor/bin/wireless_init
-vendor/etc/configstore/wigig.xml
-vendor/etc/init/android.hardware.wifi.supplicant-service.rc
-vendor/etc/init/vendor.qti.hardware.wifi.wifilearner@1.0-service.rc
-vendor/etc/hostapd/hostapd.accept
-vendor/etc/hostapd/hostapd.deny
-vendor/etc/hostapd/hostapd_default.conf
-vendor/lib/libwigig_flashaccess.so
-vendor/lib/libwigig_ftm_flows.so
-vendor/lib/libwigig_pciaccess.so
-vendor/lib/libwigig_utils.so
-vendor/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so
-vendor/lib64/libwigig_flashaccess.so
-vendor/lib64/libwigig_ftm_flows.so
-vendor/lib64/libwigig_pciaccess.so
-vendor/lib64/libwigig_utils.so
-vendor/lib64/vendor.qti.hardware.fstman@1.0.so
-vendor/lib64/vendor.qti.hardware.wifi.wifilearner@1.0.so
-vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
-
-# Misc
-system_ext/bin/dun-server
-system_ext/bin/rtspclient
-system_ext/bin/rtspserver
-system_ext/bin/test_diag_system
-system_ext/etc/cdma_call_conf.xml
-system_ext/etc/compatconfig/settings-platform-compat-config.xml
-system_ext/etc/group
--system_ext/framework/ActivityExt.jar
--system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar
-system_ext/lib/libavenhancements.so
-system_ext/lib/libbt-logClient.so
-system_ext/lib/libbtconfigstore.so
-system_ext/lib/libjnihelpers.so
-system_ext/lib/liblistenjni.qti.so
-system_ext/lib/liblistensoundmodel2.qti.so
-system_ext/lib/libmdsprpc_system.so
-system_ext/lib/libmediasp_jni.so
-system_ext/lib/libmink-sock-native-api.so
-system_ext/lib/libminksocket_system.so
-system_ext/lib/liboemaids_system.so
-system_ext/lib/libqcc.so
-system_ext/lib/libqcomfm_jni.so
-system_ext/lib/libqct_resampler.so
-system_ext/lib/libsdm-disp-apis.qti.so
-system_ext/lib/libsdsprpc_system.so
-system_ext/lib/libsd_sdk_display.qti.so
-system_ext/lib/libseccam-ipc.so
-system_ext/lib/libseccam.so
-system_ext/lib/libseccamservice.so
-system_ext/lib/libskewknob_system.so
-system_ext/lib/libslmiptablemgr.so
-system_ext/lib/libvraudio.so
-system_ext/lib/libvraudio_client.qti.so
-system_ext/lib/libvr_amb_engine.so
-system_ext/lib/libvr_object_engine.so
-system_ext/lib/libvr_sam_wrapper.so
-system_ext/lib/vendor.qti.diaghal@1.0.so
-system_ext/lib/vendor.qti.hardware.seccam@1.0.so
-system_ext/lib/vendor.qti.qspmhal@1.0.so
-system_ext/lib64/libavenhancements.so
-system_ext/lib64/libbt-logClient.so
-system_ext/lib64/libbtconfigstore.so
-system_ext/lib64/libjnihelpers.so
-system_ext/lib64/liblistenjni.qti.so
-system_ext/lib64/liblistensoundmodel2.qti.so
-system_ext/lib64/libmdsprpc_system.so
-system_ext/lib64/libmediasp_jni.so
-system_ext/lib64/libmink-sock-native-api.so
-system_ext/lib64/libminksocket_system.so
-system_ext/lib64/libmmhttpstack.so
-system_ext/lib64/libmmiipstreammmihttp.so
-system_ext/lib64/libmmipstreamnetwork.so
-system_ext/lib64/libmmipstreamsourcehttp.so
-system_ext/lib64/libmmipstreamutils.so
-system_ext/lib64/libmmQSM.so
-system_ext/lib64/libmsp.so
-system_ext/lib64/liboemaids_system.so
-system_ext/lib64/libqcc.so
-system_ext/lib64/libqcomfm_jni.so
-system_ext/lib64/libsdm-disp-apis.qti.so
-system_ext/lib64/libsdsprpc_system.so
-system_ext/lib64/libseccam-ipc.so
-system_ext/lib64/libseccam.so
-system_ext/lib64/libseccamservice.so
-system_ext/lib64/libskewknob_system.so
-system_ext/lib64/libslmiptablemgr.so
-system_ext/lib64/libvraudio.so
-system_ext/lib64/libvraudio_client.qti.so
-system_ext/lib64/libvr_amb_engine.so
-system_ext/lib64/libvr_object_engine.so
-system_ext/lib64/libvr_sam_wrapper.so
-system_ext/lib64/vendor.qti.diaghal@1.0.so
-system_ext/lib64/vendor.qti.hardware.seccam@1.0.so
-system_ext/lib64/vendor.qti.qspmhal@1.0.so
-vendor/bin/applypatch
-vendor/bin/boringssl_self_test32
-vendor/bin/boringssl_self_test64
-vendor/bin/cplay
-vendor/bin/dumpsys
-vendor/bin/hal_proxy_daemon
-vendor/bin/host_manager_11ad
-vendor/bin/hw/capabilityconfigstoretest
-vendor/bin/ks
-vendor/bin/loadalgo
-vendor/bin/mmid
-vendor/bin/mutualex
-vendor/bin/myftm
-vendor/bin/pktlogconf
-vendor/bin/PktRspTest
-vendor/bin/PNX_TAS2557.ftcfg
-vendor/bin/ppd
-vendor/bin/qcc-trd
-vendor/bin/qtigetprop
-vendor/bin/qtisetprop
-vendor/bin/shell_11ad
-vendor/bin/sigma_dut
-vendor/bin/spectraltool
-vendor/bin/ssgqmigd
-vendor/bin/ssgtzd
-vendor/bin/vendor_cmd_tool
-vendor/bin/wdsdaemon
-vendor/etc/init/boringssl_self_test.rc
-vendor/etc/init/vendor.qti.hardware.fstman@1.0-service.rc
-vendor/etc/init/vendor_flash_recovery.rc
-vendor/lib/carwatchdog_aidl_interface-V2-ndk_platform.so
-vendor/lib/libboot_control_qti.so
-vendor/lib/libcvimage_api.so
-vendor/lib/libjnihelper.so
-vendor/lib/libopus.so
-vendor/lib/libspeexresamplercust.so
-vendor/lib/libvorbisidec.so
-vendor/lib/libvpx.so
-vendor/lib/vendor.qti.hardware.automotive.vehicle@1.0.so
-vendor/lib64/carwatchdog_aidl_interface-V2-ndk_platform.so
-vendor/lib64/libboot_control_qti.so
-vendor/lib64/libcvimage_api.so
-vendor/lib64/libjnihelper.so
-vendor/lib64/libreffeature.so
-vendor/lib64/vendor.qti.hardware.automotive.vehicle@1.0.so
->>>>>>> 5df0224... phoenix: Switch to aidl vibrator hal.