From 7da4616689e0ff09f7dd7b13134b667760e268c6 Mon Sep 17 00:00:00 2001 From: jonerlin Date: Wed, 5 Apr 2023 22:18:50 +0800 Subject: [PATCH] bt: update BQR event_mask and set vendor quality configuration enable Vendor Specific Quality event as default. set bqr event_mask to 295006 (0x4805e), vnd_quality_mask to 29 (0x1d) for user debug or eng rom Bug: 240636731 Test: manual test vendor specific masks Change-Id: I6b2099bc0a0b8ea133a40a286855e2b0fa91e686 --- bluetooth/bt_vendor_overlay.conf | 3 ++- bluetooth/bt_vendor_overlay_ripcurrent.conf | 3 ++- device-husky.mk | 8 ++++++-- device-ripcurrent.mk | 8 ++++++-- device-shiba.mk | 8 ++++++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index b796740..5acb97b 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -10,7 +10,8 @@ AocPowerPinCtrlCheckEnable = true SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 262238 +# TODO: remove this bqr event mask setting after Alpha exit +BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf index edf5f27..2473a1b 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf @@ -7,7 +7,8 @@ UartPort = /dev/ttySAC18 SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 262238 +# TODO: remove this bqr event mask setting after Alpha exit +BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus diff --git a/device-husky.mk b/device-husky.mk index 839ef05..59a3138 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -137,10 +137,14 @@ 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 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 endif # Spatial Audio diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 3286cd0..96aca08 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -125,10 +125,14 @@ 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 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 endif # default BDADDR for EVB only diff --git a/device-shiba.mk b/device-shiba.mk index 76c77a3..d904d28 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -124,10 +124,14 @@ 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 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 endif # Spatial Audio