Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 7374840 from 98bd2e2fff0506996a1fe9b08bddda07fdef6704 to sc-v2-release

Browse source 
Change-Id: Id57bb9b0a7f65e72c2a4430a18ffc5b1c823579c
This commit is contained in:
android-build-team Robot 2021-05-19 01:02:45 +00:00
commit a48124e0bb
5 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
audio/oriole/config/audio_policy_configuration.xml
View file

@ -48,13 +48,11 @@
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<!-- TODO(186720581): revert this change when b/178431048 is fixed
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
</mixPort> </mixPort>
-->
<mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@ -176,11 +174,11 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out" <route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones" <route type="mix" sink="BT A2DP Headphones"
@ -188,9 +186,9 @@
<route type="mix" sink="BT A2DP Speaker" <route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="USB Device Out" <route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="USB Headset Out" <route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset" <route type="mix" sink="BT SCO Headset"

8
audio/oriole/config/mixer_paths.xml
View file

@ -35,6 +35,14 @@
<ctl name="TDM_0_TX Chan" value="Four"/> <ctl name="TDM_0_TX Chan" value="Four"/>
<ctl name="TDM_0_TX Format" value="S32_LE"/> <ctl name="TDM_0_TX Format" value="S32_LE"/>
<!-- Haptic setting -->
<ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/>
<ctl name="HAPTIC_RX nSlot" value="Four"/>
<ctl name="RX Slots" id="0" value="2"/>
<ctl name="RX Slots" id="1" value="3"/>
<!-- Cirrus Booster Amp TDM slot assignment--> <!-- Cirrus Booster Amp TDM slot assignment-->
<!-- RX slot --> <!-- RX slot -->
<ctl name="ASPRX1 Slot Position" value="0"/> <ctl name="ASPRX1 Slot Position" value="0"/>

12
audio/raven/config/audio_policy_configuration.xml
View file

@ -48,13 +48,11 @@
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<!-- TODO(186720581): revert this change when b/178431048 is fixed
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
</mixPort> </mixPort>
-->
<mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@ -176,11 +174,11 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out" <route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones" <route type="mix" sink="BT A2DP Headphones"
@ -188,9 +186,9 @@
<route type="mix" sink="BT A2DP Speaker" <route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="USB Device Out" <route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="USB Headset Out" <route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"
sources="primary output,deep buffer,compressed_offload,voip_rx"/> sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset" <route type="mix" sink="BT SCO Headset"

8
audio/raven/config/mixer_paths.xml
View file

@ -35,6 +35,14 @@
<ctl name="TDM_0_TX Chan" value="Four"/> <ctl name="TDM_0_TX Chan" value="Four"/>
<ctl name="TDM_0_TX Format" value="S32_LE"/> <ctl name="TDM_0_TX Format" value="S32_LE"/>
<!-- Haptic setting -->
<ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/>
<ctl name="HAPTIC_RX nSlot" value="Four"/>
<ctl name="RX Slots" id="0" value="2"/>
<ctl name="RX Slots" id="1" value="3"/>
<!-- Cirrus Booster Amp TDM slot assignment--> <!-- Cirrus Booster Amp TDM slot assignment-->
<!-- RX slot --> <!-- RX slot -->
<ctl name="ASPRX1 Slot Position" value="0"/> <ctl name="ASPRX1 Slot Position" value="0"/>

3
conf/init.raviole.rc
View file

@ -8,8 +8,9 @@ on early-boot
wait_for_prop vendor.common.modules.ready 1 wait_for_prop vendor.common.modules.ready 1
start insmod_sh_raviole start insmod_sh_raviole
# Disables fingerprint antispoof by default # Disables fingerprint antispoof on PROTO1.0 devices
on boot && property:ro.build.type=userdebug && \ on boot && property:ro.build.type=userdebug && \
property:ro.revision=PROTO1.0 && \
property:persist.vendor.fingerprint.disable.fake.override=none property:persist.vendor.fingerprint.disable.fake.override=none
setprop vendor.fingerprint.disable.fake 100 setprop vendor.fingerprint.disable.fake 100