Bluetooth: Enable AAC VBR by default
AAC VBR is more preferred than CBR for A2DP playback.
Bug: 192203000
Test: dumpsys bluetooth_manager
Change-Id: I8f758c102164da9936de7ddc0bb46e0a99279359
diff --git a/device-oriole.mk b/device-oriole.mk
index eaed050..eb4038c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -56,6 +56,10 @@
device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json
+# Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
# Bluetooth Tx power caps for oriole
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
diff --git a/device-raven.mk b/device-raven.mk
index 0e9c09d..b4f4e64 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -62,6 +62,10 @@
PRODUCT_COPY_FILES += \
device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
+# Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
# Bluetooth Tx power caps for raven
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
diff --git a/device-slider.mk b/device-slider.mk
index b50ad5f..f4e6b57 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -48,10 +48,12 @@
device/google/raviole/media_profiles_slider.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
# Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Bluetooth default BDADDR for EVB only
PRODUCT_PROPERTY_OVERRIDES += \
- ro.bluetooth.a2dp_offload.supported=true \
- persist.bluetooth.a2dp_offload.disabled=false \
- persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
# SecureElement
PRODUCT_PACKAGES += \
@@ -62,10 +64,6 @@
device/google/gs101/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
device/google/gs101/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
# NFC
PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libnfc-hal-st-disable.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
diff --git a/device-whitefin.mk b/device-whitefin.mk
index a583358..17e4d45 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -51,6 +51,9 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.bluetooth.a2dp_offload.supported=false
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
# NFC
PRODUCT_COPY_FILES += \
device/google/gs101/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf