Merge "audio: Enable multiple USB Audio support" into udc-qpr-dev am: 2e5633c8f8 am: 8c1a623613

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24121467

Change-Id: Ia094d8f6a8b838b1c5a88845a68f72eff8e720b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Carter Hsu 2023-07-25 20:41:10 +00:00 committed by Automerger Merge Worker
commit 1d6c25755d
3 changed files with 6 additions and 2 deletions

View file

@ -205,7 +205,7 @@
<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,hifi_playback,immersive_out"/> sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="USB Dock" <route type="mix" sink="USB Dock"
sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> sources="primary output,deep buffer,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,hifi_playback,immersive_out"/> sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"

View file

@ -186,7 +186,7 @@
<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,hifi_playback,immersive_out"/> sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
<route type="mix" sink="USB Dock" <route type="mix" sink="USB Dock"
sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> sources="primary output,deep buffer,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,raw,mmap_no_irq_out"/> sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
<route type="mix" sink="BT SCO Headset" <route type="mix" sink="BT SCO Headset"

View file

@ -270,6 +270,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true persist.vendor.camera.exif_reveal_make_model=true
# Audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.multi_usb_mode=true
# AudioProxy # AudioProxy
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libaudio_proxy.google \ libaudio_proxy.google \