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

Commit c8f3fddf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "config: remove USB devices in policy config file"

parents a17b380a ab6a1a55

configs/msmnile_au/audio_policy_configuration.xml

+4 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2018, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -270,14 +270,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
@@ -308,18 +300,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             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_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </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_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>



            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->
@@ -342,29 +322,24 @@ 
                       sources="primary output"/>

                <route type="mix" sink="BT SCO All"

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

                <route type="mix" sink="USB Device Out"

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

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

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

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

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

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

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

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

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

                <route type="mix" sink="BT A2DP Out"

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

                <route type="mix" sink="BT A2DP Headphones"

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

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

            </routes>



        </module>
@@ -392,24 +367,7 @@ 
        </module>



        <!-- Usb Audio HAL -->

        <module name="usb" halVersion="2.0">

            <mixPorts>

                <mixPort name="usb_accessory output" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

            </devicePorts>

            <routes>

                <route type="mix" sink="USB Host Out"

                       sources="usb_accessory output"/>

            </routes>

        </module>

        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>

configs/msmsteppe_au/audio_policy_configuration.xml

+4 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2018, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -270,14 +270,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
@@ -308,18 +300,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             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_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </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_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>



            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->
@@ -342,29 +322,24 @@ 
                       sources="primary output"/>

                <route type="mix" sink="BT SCO All"

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

                <route type="mix" sink="USB Device Out"

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

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

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

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

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

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

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

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

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

                <route type="mix" sink="BT A2DP Out"

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

                <route type="mix" sink="BT A2DP Headphones"

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

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

            </routes>



        </module>
@@ -392,24 +367,7 @@ 
        </module>



        <!-- Usb Audio HAL -->

        <module name="usb" halVersion="2.0">

            <mixPorts>

                <mixPort name="usb_accessory output" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

            </devicePorts>

            <routes>

                <route type="mix" sink="USB Host Out"

                       sources="usb_accessory output"/>

            </routes>

        </module>

        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>