From 9c30b3e7a065ff25f919cbcb1dfe06b11a2797fa Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Thu, 27 Oct 2022 09:53:49 +0000 Subject: [PATCH 1/4] BT: add sysprop to enable OPUS codec Add new system proprty persist.bluetooth.opus.enabled to indicate devices enable OPUS codec. Bug: 254609888 Test: atest net_test_stack:A2dpCodecConfigTest#init Change-Id: I3741ea42b5513ae1dd0cb7609301953a13861293 (cherry picked from commit 1eda2f37e7bb73ed1bfebd8029054ed594210de3) Merged-In: I3741ea42b5513ae1dd0cb7609301953a13861293 --- bluetooth/bt_vendor_overlay.conf | 2 ++ device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 70f14cb..0b1c80f 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -10,3 +10,5 @@ SarBackOffHighResolution = true BqrEventMaskValueUpdate = 262238 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus + +BtOpusEnabled = true diff --git a/device-cheetah.mk b/device-cheetah.mk index 6b022f7..3241bec 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -164,6 +164,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ hci_inject +# Bluetooth OPUS codec +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.opus.enabled=true + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ diff --git a/device-panther.mk b/device-panther.mk index bad75e7..cba7941 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -147,6 +147,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ hci_inject +# Bluetooth OPUS codec +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.opus.enabled=true + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ From 8650a947cdf9fb91bc9722c3a50e140b50f528e4 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 31 Oct 2022 21:43:15 +0000 Subject: [PATCH 2/4] Revert "Disable Spatial Audio [ DO NOT MERGE ]" This reverts commit 8dce1c1ea93c4ab76a38e40267895175aebc5ac6. Reason for revert: disabling was temporary Change-Id: Iaf78952b28144c17cd62f16f7e52e71a32b8084f (cherry picked from commit ef8c3d4564b0dcb6e64b6a523c7470ab5a46bbac) Merged-In: Iaf78952b28144c17cd62f16f7e52e71a32b8084f --- device-cheetah.mk | 4 ++-- device-panther.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3241bec..ca6ea10 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -182,9 +182,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-panther.mk b/device-panther.mk index cba7941..5eedad9 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -165,9 +165,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service From 8c87e9427bcb786bc2a1fddbda13c0226a97cce9 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 17:41:50 +0000 Subject: [PATCH 3/4] Update panther SVN to 11 Bug: 258811679 Change-Id: I607fdc9c2a084f332916acfd769ee81872f68dcd (cherry picked from commit cdb75cbc48bb70456e80c5bda77ae3d91ad0b074) Merged-In: I607fdc9c2a084f332916acfd769ee81872f68dcd --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 5eedad9..8433f30 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -253,7 +253,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=10 + ro.vendor.build.svn=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 63f0f2bd10549bbd8eb2d2be0ff3753d8de7d6a8 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 17:43:13 +0000 Subject: [PATCH 4/4] Update cheetah SVN to 11 Bug: 258811679 Change-Id: Ia500a18b451d62522ce9550a95d12fd8f4f4fec8 (cherry picked from commit ac6db324ef9feed0951a288949c3ef36fde7c788) Merged-In: Ia500a18b451d62522ce9550a95d12fd8f4f4fec8 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ca6ea10..7794bc3 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -266,7 +266,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=10 + ro.vendor.build.svn=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \