resolve merge conflicts of 044b8c4e1d
to master
Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: Ie90c3bca8cd6a6573ba0245b4e7460d56b65cde8
This commit is contained in:
commit
9d6e665716
3 changed files with 10 additions and 0 deletions
|
@ -1,3 +1,5 @@
|
|||
# This is BTBCM HAL overlay configuration file.
|
||||
|
||||
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
|
||||
|
||||
BtOpusEnabled = true
|
||||
|
|
|
@ -257,6 +257,10 @@ PRODUCT_COPY_FILES += \
|
|||
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 += \
|
||||
|
|
|
@ -268,6 +268,10 @@ PRODUCT_COPY_FILES += \
|
|||
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 += \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue