diff options
| author | Bill Yi <byi@google.com> | 2023-01-06 07:04:54 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2023-01-06 15:30:13 +0000 |
| commit | 9cf3c4c2f0b07f19f64521533ec448fc80588d57 (patch) | |
| tree | b002e2c1fb84d3c513a301605502fd81e006b94e | |
| parent | 928f8853dda8f04719d983f8e0105928945d1c74 (diff) | |
| parent | c261645d132ff9fb5f4e9cd7c1d42d8b9b28f477 (diff) | |
| download | pantah-main-16k-with-phones.tar.gz | |
Merge TQ1A.230105.002 to aosp-master - DO NOT MERGEmain-16k-with-phones
Merged-In: I8683963e7f5a74063968d442691b4f7e49b4fa10
Merged-In: I661b9803484797b1ee6f55d5edc9364729927b2c
Change-Id: I8df5df5559a92f2ee0f304bb7f7ae34ac44ba966
| -rw-r--r-- | bluetooth/bt_vendor_overlay.conf | 2 | ||||
| -rw-r--r-- | device-cheetah.mk | 10 | ||||
| -rw-r--r-- | device-panther.mk | 10 |
3 files changed, 16 insertions, 6 deletions
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..7794bc3 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 \ @@ -178,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 @@ -262,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 += \ diff --git a/device-panther.mk b/device-panther.mk index bad75e7..8433f30 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 \ @@ -161,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 @@ -249,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 += \ |