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

Commit 4cf76622 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 11081b3d on remote branch 

Change-Id: Ic0167bd9f7180a4546970775fd055435e04a5e03
parents b8f614b0 11081b3d

configs/atoll/atoll.mk

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



BOARD_SUPPORTS_OPENSOURCE_STHAL := true



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

configs/atoll/audio_policy_configuration.xml

+0 −19
Original line number Diff line number Diff line
@@ -319,27 +319,8 @@ 
                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <!-- edit as needed -->

                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </devicePort>

                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <!-- edit as needed -->

                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </devicePort>



            </devicePorts>

configs/atoll/mixer_paths_idp.xml

+4 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,10 @@ 
        <path name="handset" />

    </path>



    <path name="voice-handset-tmus">

        <path name="handset" />

    </path>



    <path name="voice-speaker">

        <path name="speaker-mono" />

    </path>

configs/atoll/mixer_paths_qrd.xml

+4 −0
Original line number Diff line number Diff line
@@ -2151,6 +2151,10 @@ 
        <path name="handset" />

    </path>



    <path name="voice-handset-tmus">

        <path name="handset" />

    </path>



    <path name="voice-speaker">

        <path name="speaker-mono" />

    </path>

configs/atoll/mixer_paths_wcd9375.xml

+4 −0
Original line number Diff line number Diff line
@@ -2155,6 +2155,10 @@ 
        <path name="handset" />

    </path>



    <path name="voice-handset-tmus">

        <path name="handset" />

    </path>



    <path name="voice-speaker">

        <path name="speaker-mono" />

    </path>