commit 687b83cd3b15f67e831d7e02dd2f4ffcae84151b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 15 01:51:36 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 15 01:51:36 2022 +0000
tree bc15ef2e06d7bf2e9a721d6cd09bef4d2a76df9f
parent c5f04e42caa0e3fbb375cd7fd839cada6e13aba0
parent c55e6c1dc9a0fce87d2ce06defe472d54d87ee72

Merge cherrypicks of [20296724, 20312491, 20450283, 20450756] into tm-qpr1-release.

Change-Id: Ic2c03cd9be97bee5b50f6455c80b40a7c4ba78ce

bluetooth/bt_vendor_overlay.conf

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index d5212db..4208da8 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -1,3 +1,5 @@
 # This is BTBCM HAL overlay configuration file.
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
+
+BtOpusEnabled = true

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index c9e69ab..3585699 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=41
+    ro.vendor.build.svn=42
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -243,9 +243,9 @@
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio: disabled
+# declare use of spatial audio
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=false
+    ro.audio.spatializer_enabled=true
 
 PRODUCT_PACKAGES += \
 	libspatialaudio
@@ -267,3 +267,7 @@
 # Enable adpf cpu hint session for SurfaceFlinger
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
+
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index c337c13..1712beb 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -180,7 +180,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=41
+    ro.vendor.build.svn=42
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -256,9 +256,9 @@
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio: disabled
+# declare use of spatial audio
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=false
+    ro.audio.spatializer_enabled=true
 
 PRODUCT_PACKAGES += \
 	libspatialaudio
@@ -280,3 +280,7 @@
 # Enable adpf cpu hint session for SurfaceFlinger
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
+
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true