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

Merge "audio: remove speaker-safe" into tm-qpr-dev am: 033bbce33c

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20715946

Change-Id: I41b2b80cb85b9a4721a7ec064567fc0484529f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-12-15 02:41:56 +00:00 • committed by Automerger Merge Worker
commit ab2938a468
3 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
audio/felix/config/audio_policy_configuration.xml
View file

@ -17,7 +17,6 @@
<module name="primary" halVersion="2.0"> <module name="primary" halVersion="2.0">
<attachedDevices> <attachedDevices>
<item>Speaker</item> <item>Speaker</item>
<item>Speaker Safe</item>
<item>Earpiece</item> <item>Earpiece</item>
<item>Built-In Mic</item> <item>Built-In Mic</item>
<item>Built-In Back Mic</item> <item>Built-In Back Mic</item>
@ -133,8 +132,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink"> <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -183,8 +180,6 @@
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
<route type="mix" sink="Speaker Safe"
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,haptic,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"

5
audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -17,7 +17,6 @@
<module name="primary" halVersion="2.0"> <module name="primary" halVersion="2.0">
<attachedDevices> <attachedDevices>
<item>Speaker</item> <item>Speaker</item>
<item>Speaker Safe</item>
<item>Earpiece</item> <item>Earpiece</item>
<item>Built-In Mic</item> <item>Built-In Mic</item>
<item>Built-In Back Mic</item> <item>Built-In Back Mic</item>
@ -132,8 +131,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink"> <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -169,8 +166,6 @@
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
<route type="mix" sink="Speaker Safe"
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,haptic,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 Device Out" <route type="mix" sink="USB Device Out"

5
audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -17,7 +17,6 @@
<module name="primary" halVersion="2.0"> <module name="primary" halVersion="2.0">
<attachedDevices> <attachedDevices>
<item>Speaker</item> <item>Speaker</item>
<item>Speaker Safe</item>
<item>Earpiece</item> <item>Earpiece</item>
<item>Built-In Mic</item> <item>Built-In Mic</item>
<item>Built-In Back Mic</item> <item>Built-In Back Mic</item>
@ -128,8 +127,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink"> <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -165,8 +162,6 @@
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
<route type="mix" sink="Speaker Safe"
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,haptic,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 Device Out" <route type="mix" sink="USB Device Out"