Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89510f03 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 789522dc on remote branch 

Change-Id: Iac7bc135147e6d1428778eba839ff18a53f22bc4
parents ec2dd23c 789522dc

configs/atoll/atoll.mk

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ vendor.audio.flac.sw.decoder.24bit=true 


#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#split a2dp DSP supported encoder list

configs/bengal/audio_policy_configuration.xml

100644 → 100755
+9 −1
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ 
                        channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

                <mixPort name="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

            </mixPorts>



            <devicePorts>
@@ -371,6 +377,8 @@ 
                <route type="mix" sink="BT A2DP Speaker"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

                <route type="mix" sink="fast input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

            </routes>



        </module>

configs/bengal/bengal.mk

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ ro.vendor.audio.sdk.ssr=false 


#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#enable dsp gapless mode by default

configs/kona/kona.mk

+9 −0
Original line number Diff line number Diff line
@@ -277,6 +277,11 @@ ro.vendor.audio.sdk.ssr=false 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.offload.gapless.enabled=true



#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#enable pbe effects

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.safx.pbe.enabled=false
@@ -453,6 +458,10 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.2-impl \



# enable sound trigger hidl hal 2.3

PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.3-impl \



PRODUCT_PACKAGES_ENG += \

    VoicePrintTest \

    VoicePrintDemo

configs/lahaina/lahaina.mk

+4 −1
Original line number Diff line number Diff line
@@ -168,7 +168,10 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_cdp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_cdp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_configs.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_configs_stock.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/default_volume_tables.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_policy_volumes.xml



#Copy generic APM XML file to common folder for runtime copy

PRODUCT_COPY_FILES += \