Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: Ia874d0f760f54a96b1f4280a883251374910037c
Merged-In: I07404eaff792548d83461fa34837123d95808094
Change-Id: Ie6e414cd89b69050a1634cce04f4070f707832a4
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
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
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