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

Commit 810642b4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 30ebb70f on remote branch 

Change-Id: Ib8179a9d77e811d236044f57d3b9e81d3ac4fa3b
parents ebed202d 30ebb70f

configs/msm8909/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
                    <profile name="" format="AUDIO_FORMAT_EVRCNW"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="primary input" role="sink">

                <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">

                     <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"/>

configs/msm8909/msm8909.mk

+1 −4
Original line number Diff line number Diff line
@@ -136,11 +136,8 @@ vendor.audio.sys.init=false 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.dolby.ds2.enabled=true



ifneq ($(strip $(TARGET_HAS_LOW_RAM)),true)

PRODUCT_PACKAGES += android.hardware.audio@2.0-service

endif



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

configs/msm8937/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>



                <mixPort name="primary input" role="sink">

                <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <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"/>

configs/msm8953/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>



                <mixPort name="primary input" role="sink">

                <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <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"/>

configs/msm8953/mixer_paths.xml

+5 −0
Original line number Diff line number Diff line
@@ -376,6 +376,11 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 bt-sco-wb">

        <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />

        <path name="compress-offload-playback2 bt-sco" />

    </path>



    <path name="compress-offload-playback transmission-fm">

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />

    </path>