From b271d52cedd6cdb6b1d0e374d506d25e6b57fcf4 Mon Sep 17 00:00:00 2001
From: kuanyuhuang <kuanyuhuang@google.com>
Date: Mon, 27 Nov 2023 05:33:00 +0000
Subject: [PATCH] Update Bluetooth config

Update Bluetooth configuration for pre-FBU

Bug: 313336033
Test: manual
Change-Id: Ibeaad4157d079f523785adf5bd95a0edfd32de10
---
 bluetooth/bt_vendor_overlay_tegu.conf |  7 -------
 device-tegu.mk                        | 24 +++++++++---------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/bluetooth/bt_vendor_overlay_tegu.conf b/bluetooth/bt_vendor_overlay_tegu.conf
index 19388fc..fd5d4ed 100644
--- a/bluetooth/bt_vendor_overlay_tegu.conf
+++ b/bluetooth/bt_vendor_overlay_tegu.conf
@@ -9,11 +9,4 @@ UartPort = /dev/ttySAC18
 # Sar backOff high resolution support
 SarBackOffHighResolution = true
 
-# Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
-
-BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
-
-BtOpusEnabled = true
-
 AccelBtDisable = false
diff --git a/device-tegu.mk b/device-tegu.mk
index cf7a7f2..717100c 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -89,24 +89,12 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=true \
     persist.bluetooth.a2dp_offload.disabled=false \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
-
-# Spatial Audio
-PRODUCT_PACKAGES += \
-	libspatialaudio
-
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true
+    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 
 # Bluetooth hci_inject test tool
 PRODUCT_PACKAGES_DEBUG += \
     hci_inject
 
-# Bluetooth OPUS codec
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.opus.enabled=true
-
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
     sar_test
@@ -122,10 +110,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=262238
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=94
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # default BDADDR for EVB only