Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflicts of 044b8c4e1d to master

Browse source 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie90c3bca8cd6a6573ba0245b4e7460d56b65cde8
This commit is contained in:
Jakub Pawlowski 2022-10-31 22:04:26 +01:00
commit 9d6e665716
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bluetooth/bt_vendor_overlay.conf
View file

@ -1,3 +1,5 @@
# This is BTBCM HAL overlay configuration file. # This is BTBCM HAL overlay configuration file.
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
BtOpusEnabled = true

4
device-oriole.mk
View file

@ -257,6 +257,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true debug.sf.enable_adpf_cpu_hint=true
# Bluetooth OPUS codec
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true
# Location # Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

4
device-raven.mk
View file

@ -268,6 +268,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true debug.sf.enable_adpf_cpu_hint=true
# Bluetooth OPUS codec
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true
# Location # Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \