resolve merge conflicts of 044b8c4e1d8ccdda798e39984394090136a359f4 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie90c3bca8cd6a6573ba0245b4e7460d56b65cde8
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 3caae07..a034a01 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -257,6 +257,10 @@
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.opus.enabled=true
+
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index cccf860..b965539 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -268,6 +268,10 @@
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.opus.enabled=true
+
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \