diff --git a/manifest.xml b/manifest.xml
index dffceebe..418e2202 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -166,6 +166,11 @@
hwbinder
@1.1::IFactory/default
+
+ vendor.qti.hardware.bluetooth_audio
+ hwbinder
+ @2.0::IBluetoothAudioProvidersFactory/default
+
vendor.qti.hardware.bluetooth_sar
hwbinder
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 20a430fd..49729a0d 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -93,9 +93,15 @@ vendor.audio.feature.spkr_prot.enable=true
# Bluetooth & FM
persist.bluetooth.bluetooth_audio_hal.disabled=false
-persist.vendor.qcom.bluetooth.soc=cherokee
ro.vendor.bluetooth.wipower=false
-vendor.qcom.bluetooth.soc=cherokee
+persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac
+persist.vendor.bt.aac_frm_ctl.enabled=true
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
+persist.vendor.qcom.bluetooth.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.scram.enabled=false
+persist.vendor.qcom.bluetooth.soc=cherokee
+ro.bluetooth.a2dp_offload.supported=true
ro.vendor.fm.use_audio_session=true
# Camera
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 265dca52..98298b39 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -80,16 +80,8 @@ vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc|a03a9a1c818595b19272ea6
vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so|b69cf46ee3e4e8ec0461804491e95be6757b36a4
vendor/lib64/vendor.qti.hardware.alarm@1.0.so|464f1137f33a50f1f6ca8114969dad278a3b3cbf
-# ANT - from LA.UM.9.1.r1-10900-SMxxx0.0
-vendor/lib/hw/com.dsi.ant@1.0-impl.so|d99ff0030ce14172d9d10e0b1f31b2d201aade10
-vendor/lib64/hw/com.dsi.ant@1.0-impl.so|0f8f5c3081d0ef745e0896b1fceea15f52fe3b21
-
-# ANT+ - from LA.UM.8.2.1.r1-05600-sdm660
-product/lib/com.qualcomm.qti.ant@1.0.so:system_ext/lib/com.qualcomm.qti.ant@1.0.so|fbbb33e875c9f64f0401e6cbcbac8e0c15766481
-product/lib64/com.qualcomm.qti.ant@1.0.so:system_ext/lib64/com.qualcomm.qti.ant@1.0.so|1a7bee1627309c8eee55dab22b9f25c2302219ae
-vendor/lib/com.qualcomm.qti.ant@1.0.so|f7fb088a6fcc746b4b9f661010542b543a74b92f
-vendor/lib64/com.qualcomm.qti.ant@1.0.so|5ef111c6ecb35b94233ae694d80161e9f61b7cd6
-vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so|203528c568c1c5ce33b35dcb9ee9eb7ecb1de206
+# ANT+ - from S62Pro
+vendor/lib64/hw/com.dsi.ant@1.0-impl.so|87dc1a131534659173e71e108e7a3ffe6325845f
# Audio FX modules - from LA.UM.8.2.1.r1-05600-sdm660
vendor/lib/soundfx/libasphere.so|eaa35262337a8401aaecf02997e98e24083f064c
@@ -104,28 +96,28 @@ vendor/lib64/soundfx/libqcvirt.so|a362fce913d3ef85cd4d65fcfd09f53c00043bd6
# Audio FX modules - from LA.UM.8.2.r1-07500-sdm660.0
vendor/lib/soundfx/libmisoundfx.so|569ee2df586e95116b79cfb3d89429f2032a7a76
-# Bluetooth (aptX) - from sunfish RQ1A.201205.008
+# Bluetooth - from S62Pro
+vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti|07d96d0d3c4a500b14ea3c97e02b9eb5ee2bbc4d
+vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc|f4ee3b2da2b08647447869ade86ec63f7340accc
+vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so|c6be436d0f66aafd5be3aa51431d4fc02c50971d
+vendor/lib64/libbtnv.so|0c74a43550b939b9496b03b3285fa950cf560c48
+
+# Bluetooth (A2DP) - from S62Pro
+vendor/lib/hw/audio.bluetooth_qti.default.so|0fc8e709075ba7e984a4d5a1e9f7143698a78f98
+vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so|f5ea997b223943101bed84470f191b2e4ce8957c
+vendor/lib/btaudio_offload_if.so|752c3e774c1585f7842ecbd85180365d85fc789f
+vendor/lib/libbluetooth_audio_session_qti.so|9a86488113e10594e0a3d4a36b436c6b7fd59317
+vendor/lib/libbluetooth_audio_session_qti_2_1.so|d9f83086774e22c8a09b02fa87850fae7382fdf1
+vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so|156ec51ccb53f667605cf99422abf9357888b4b6
+vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so|3097cb00777c2911cff40e323ce3c921923722d8
+vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so|cfc982fd153084781f540bcc4a31b6b05a9ced19
+vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so|23706dcfa35cc6f7dee934e13886c19a56a9aa12
+vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so|ece3dafc4447e8302109851c3a6b0d3978b3506d
+
+# Bluetooth (aptX) - from crosshatch - RQ1A.201205.003
system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
-# Bluetooth - from LA.UM.8.2.1.r1-05600-sdm660
-lib/libbtconfigstore.so|1241dd7eec5513cb08e26ca69bf2d5734cbc43eb
-lib64/libbtconfigstore.so|34b27b9ba60bd9984d4ac3e6013e13ea6631a6b6
-vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti|5acf94f38e47c2ec43c95e132dfe7b5d71ec41c4
-vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc|a979981c55f3dcaf6cf2212e71b901ca4d58b959
-vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so|9235d6327034ecbfc6ecad0ecdfd81805765acb2
-vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so|71644784c8f73573380004f1c69cf18b1e57964b
-vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so|10bddb86ecd1c7e0b0d49fef80bc4ded29a05ce1
-vendor/lib/libbt-hidlclient.so|826a5101e2c36d7877bc924b53e22cd00bec6dd6
-vendor/lib/libbtnv.so|a1b994bac9b746f51036fc829310cec4f773c621
-vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so|5d204b6e003932069782774dbae4f5f209848870
-vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so|08664074cf5c80d7209250e9c3aef90716802607
-vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so|ebdfcc7064fc144acf6cba300486c6394af3d73b
-vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so|5e06b7b33d084975d6326875268cb237ad6d8559
-vendor/lib64/libbt-hidlclient.so|0a0d0ac4e2f4e2e80f4ec488b53c18c96ff08dc6
-vendor/lib64/libbtnv.so|a6793a7b93fa607fcec39da7479566f84ed39aa4
-vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so|9b7ae20ce9d6d2a67fdac94268cec441278cca3d
-
# CDSP - from LA.UM.10.2.1.r1-03400-sdm660.0-kunmun
vendor/bin/cdsprpcd|ea126ed2f1b11622547239f331b8013320c59ad2
vendor/etc/init/vendor.qti.cdsprpc-service.rc|36772b70216796e8ef19376d9c6a81ee9ffff549
diff --git a/sdm660.mk b/sdm660.mk
index f5634458..e0288ddc 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -85,6 +85,7 @@ PRODUCT_PACKAGES += \
audio.r_submix.default \
audio.usb.default \
audio.usbv2.default \
+ liba2dpoffload \
libaudio-resampler \
libhdmiedid \
libhfp \
@@ -93,7 +94,6 @@ PRODUCT_PACKAGES += \
libqcomvisualizer \
libqcomvoiceprocessing \
libvolumelistener\
- vendor.qti.hardware.btconfigstore@1.0.vendor
# Audio Configs
PRODUCT_COPY_FILES += \
@@ -117,7 +117,7 @@ PRODUCT_COPY_FILES += \
# ANT+
PRODUCT_PACKAGES += \
- AntHalService-Soong \
+ AntHalService \
com.dsi.ant@1.0.vendor
# AuthSecret
@@ -132,10 +132,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
audio.bluetooth.default \
android.hardware.bluetooth.audio-impl \
- libbthost_if \
- libhdmiedid \
- libhfp \
- libsndmonitor
+ vendor.qti.hardware.btconfigstore@1.0.vendor \
+ vendor.qti.hardware.btconfigstore@2.0.vendor
# Boot animation
TARGET_BOOTANIMATION_SIZE := 1080p