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

Commit 2c840fb5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: provide support for callscreening for kona/lito."

parents dd11601b c0cd3ac2

configs/kona/audio_policy_configuration.xml

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>



    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>



    <!-- Modules section:

        There is one section per audio HW module present on the platform.

configs/kona/mixer_paths.xml

+38 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />

    <!-- Multimode Voice1 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -227,6 +230,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />

    <!-- Multimode Voice2 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -1853,6 +1859,10 @@ 
        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink-compress">

        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />

    </path>
@@ -1905,6 +1915,10 @@ 
        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink headset-mic">

        <path name="incall-rec-downlink" />

    </path>
@@ -1962,6 +1976,10 @@ 
        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink headset-mic">

        <path name="incall-rec-uplink-and-downlink" />

    </path>
@@ -2067,6 +2085,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call headphones">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
@@ -2193,6 +2216,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -3384,6 +3412,10 @@ 
        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />

    </path>
@@ -3459,4 +3491,10 @@ 
    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>

</mixer>

configs/kona/mixer_paths_cdp.xml

+37 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />

    <!-- Multimode Voice1 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -212,6 +215,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />

    <!-- Multimode Voice2 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -1724,6 +1730,10 @@ 
        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink-compress">

        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />

    </path>
@@ -1776,6 +1786,10 @@ 
        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink headset-mic">

        <path name="incall-rec-downlink" />

    </path>
@@ -1833,6 +1847,10 @@ 
        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink headset-mic">

        <path name="incall-rec-uplink-and-downlink" />

    </path>
@@ -1938,6 +1956,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call headphones">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
@@ -2044,6 +2067,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -3194,4 +3222,13 @@ 
    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>

    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>

</mixer>

configs/kona/mixer_paths_qrd.xml

+38 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />

    <!-- Multimode Voice1 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -211,6 +214,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />

    <!-- Multimode Voice2 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -1724,6 +1730,10 @@ 
        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink-compress">

        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />

    </path>
@@ -1776,6 +1786,10 @@ 
        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink headset-mic">

        <path name="incall-rec-downlink" />

    </path>
@@ -1833,6 +1847,10 @@ 
        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink headset-mic">

        <path name="incall-rec-uplink-and-downlink" />

    </path>
@@ -1948,6 +1966,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call headphones">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
@@ -2059,6 +2082,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -2518,6 +2546,10 @@ 
        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />

    </path>
@@ -2930,6 +2962,12 @@ 
    <path name="display-port">

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>



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

        <path name="speaker" />

        <path name="usb-headphones" />

configs/lito/audio_policy_configuration.xml

100755 → 100644
+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

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

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -21,7 +21,7 @@ 
    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>

    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>





    <!-- Modules section: