Snap for 9654363 from a62d2dc4a5 to udc-release

Change-Id: If77d43b7ab10f96238c8b3bfbd2f469737e6066a
This commit is contained in:
Android Build Coastguard Worker 2023-02-25 04:02:45 +00:00
commit ca3cd44901
7 changed files with 80 additions and 58 deletions

View file

@ -183,21 +183,21 @@
<route type="mix" sink="Earpiece"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT A2DP Headphones"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
<route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@ -208,9 +208,9 @@
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="fast input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
</routes>

View file

@ -173,11 +173,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@ -188,9 +188,9 @@
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="fast input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
</routes>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@ -184,9 +184,9 @@
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="fast input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
</routes>

View file

@ -175,6 +175,7 @@
<ctl name="BT_RX Mixer NoHost1" value="0"/>
<ctl name="BT_RX Mixer VOIP" value="0"/>
<ctl name="BT_RX Mixer IMSV" value="0"/>
<ctl name="BT_RX Mixer RAW" value="0"/>
<ctl name="INCALL_RX Mixer EP1" value="0"/>
<ctl name="INCALL_RX Mixer EP2" value="0"/>
@ -409,6 +410,10 @@
<ctl name="USB_RX Mixer RAW" value="1"/>
</path>
<path name="raw-playbackP bt">
<ctl name="BT_RX Mixer RAW" value="1"/>
</path>
<path name="raw-playbackP hearing-aid">
</path>
@ -423,6 +428,10 @@
<ctl name="USB_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP bt">
<ctl name="BT_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP hearing-aid">
</path>
@ -620,6 +629,10 @@
<ctl name="EP3 TX Mixer USB_TX" value="1"/>
</path>
<path name="low-latency-recordC bt-mic">
<ctl name="EP3 TX Mixer BT_TX" value="1"/>
</path>
<path name="mmap-recordC">
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
</path>
@ -628,6 +641,10 @@
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
</path>
<path name="mmap-recordC bt-mic">
<ctl name="EP2 TX Mixer BT_TX" value="1"/>
</path>
<!-- codec setting -->>
<!-- Rx device -->
<path name="handset">

View file

@ -1,7 +1,7 @@
#PLATFORM_NAME gChip
#EXPORT_FLAG HANDSET
#SINGLE_API_VER 1.2.1
#SAVE_TIME 2023-02-16 12:55:59
#SAVE_TIME 2023-02-22 16:23:24
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB
#PARAM_MODE FULL
@ -3833,8 +3833,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -3932,8 +3932,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -4031,8 +4031,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -4130,8 +4130,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -4229,8 +4229,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -4328,8 +4328,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -4427,8 +4427,8 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
49 0x6C58 //RX_FDEQ_GAIN_10
50 0x4C48 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
@ -13935,8 +13935,8 @@
574 0x4A48 //TX_FDEQ_GAIN_7
575 0x4242 //TX_FDEQ_GAIN_8
576 0x4C50 //TX_FDEQ_GAIN_9
577 0x5252 //TX_FDEQ_GAIN_10
578 0x6058 //TX_FDEQ_GAIN_11
577 0x524E //TX_FDEQ_GAIN_10
578 0x5658 //TX_FDEQ_GAIN_11
579 0x5656 //TX_FDEQ_GAIN_12
580 0x5670 //TX_FDEQ_GAIN_13
581 0x7070 //TX_FDEQ_GAIN_14
@ -14513,9 +14513,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -14612,9 +14612,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -14711,9 +14711,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -14810,9 +14810,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -14909,9 +14909,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -15008,9 +15008,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -15107,9 +15107,9 @@
46 0xA6A4 //RX_FDEQ_GAIN_7
47 0xB69E //RX_FDEQ_GAIN_8
48 0x9074 //RX_FDEQ_GAIN_9
49 0x6C5C //RX_FDEQ_GAIN_10
50 0x5048 //RX_FDEQ_GAIN_11
51 0x4858 //RX_FDEQ_GAIN_12
49 0x6456 //RX_FDEQ_GAIN_10
50 0x504E //RX_FDEQ_GAIN_11
51 0x4E58 //RX_FDEQ_GAIN_12
52 0x5858 //RX_FDEQ_GAIN_13
53 0x4848 //RX_FDEQ_GAIN_14
54 0x4848 //RX_FDEQ_GAIN_15
@ -53985,8 +53985,8 @@
574 0x4A48 //TX_FDEQ_GAIN_7
575 0x4242 //TX_FDEQ_GAIN_8
576 0x4C50 //TX_FDEQ_GAIN_9
577 0x5252 //TX_FDEQ_GAIN_10
578 0x6058 //TX_FDEQ_GAIN_11
577 0x524E //TX_FDEQ_GAIN_10
578 0x5658 //TX_FDEQ_GAIN_11
579 0x5656 //TX_FDEQ_GAIN_12
580 0x5670 //TX_FDEQ_GAIN_13
581 0x7070 //TX_FDEQ_GAIN_14

View file

@ -156,4 +156,9 @@
<!-- Boolean indicating whether DTIM multiplier configuration is enabled. DTIM multiplier value
is when the system is in the suspended mode -->
<bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
<!-- Boolean indicating whether the framework updates country from scan results when there is
no telephony country code and driver country code is 00.
This is applied only during the setup wizard -->
<bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
</resources>