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

Commit 294d6948 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 69fa16c7 on remote branch 

Change-Id: Ibfbce910f8bd6e55fc3999b70316ab49996f875e
parents 567d7e93 69fa16c7

configs/msm8909/msm8909.mk

+8 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ BOARD_SUPPORTS_QSTHW_API := true 
AUDIO_FEATURE_DISABLED_SOUND_TRIGGER_LEGACY_HAL := true

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true

COMPILE_HAL_TEST_APPS_IN_VENDOR_IMAGE := true



##AUDIO_FEATURE_FLAGS
@@ -168,4 +169,10 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl
 
    android.hardware.soundtrigger@2.1-impl \

    android.hardware.audio@4.0 \

    android.hardware.audio.common@4.0 \

    android.hardware.audio.common@4.0-util \

    android.hardware.audio@4.0-impl \

    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl

configs/msm8937/mixer_paths_sdm439_pm8953.xml

+7 −2
Original line number Diff line number Diff line
@@ -1255,12 +1255,17 @@ 
        <ctl name="HPHR" value="Switch" />

    </path>



    <path name="headset-mic">

    <path name="headset-mic-default">

        <path name="adc2" />

        <ctl name="ADC2 MUX" value="INP2" />

        <ctl name="IIR1 INP1 MUX" value="DEC1" />

    </path>



    <path name="headset-mic">

        <path name="headset-mic-default" />

        <ctl name="DEC1 Volume" value="74" />

    </path>



    <path name="sidetone-iir">

        <ctl name="IIR1 Enable Band1" value="1" />

        <ctl name="IIR1 Enable Band2" value="1" />
@@ -1304,7 +1309,7 @@ 
    </path>



    <path name="voice-headset-mic">

        <path name="headset-mic" />

        <path name="headset-mic-default" />

    </path>



    <path name="speaker-and-headphones">

configs/msm8996/msm8996.mk

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl \

    android.hardware.soundtrigger@2.1-impl \

    android.hardware.audio@4.0 \

    android.hardware.audio.common@4.0 \

    android.hardware.audio.common@4.0-util \

configs/msm8998/msm8998.mk

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl \

    android.hardware.soundtrigger@2.1-impl \

    android.hardware.audio@4.0 \

    android.hardware.audio.common@4.0 \

    android.hardware.audio.common@4.0-util \

configs/msmnile/audio_policy_configuration.xml

+9 −2
Original line number Diff line number Diff line
@@ -183,6 +183,11 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="surround_sound" role="sink">

                    <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,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>

                </mixPort>

                <mixPort name="usb_surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
@@ -370,13 +375,15 @@ 
                <route type="mix" sink="USB Headset Out"

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

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx"/>

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>

                <route type="mix" sink="surround_sound"

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

                       sources="Built-In Mic,Built-In Back Mic"/>

                <route type="mix" sink="usb_surround_sound"

                       sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="record_24"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>

                <route type="mix" sink="mmap_no_irq_in"