From dcf54dff3a829e4eff4d9698766ea4cf6cf5a435 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Wed, 28 Jun 2023 10:31:27 +0800
Subject: [PATCH] audio: Enable multiple USB Audio support

Bug: 289334178
Test: verified USB Audio on test build
Change-Id: I4675165a62f6779b33511c1a3f4e55cdfe7dd9cf
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 audio/tangorpro/config/audio_policy_configuration.xml         | 2 +-
 .../audio_policy_configuration_a2dp_offload_disabled.xml      | 2 +-
 device-tangorpro.mk                                           | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 65c3907..4c35125 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -205,7 +205,7 @@
                 <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"/>
                 <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"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
                 <route type="mix" sink="BT SCO"
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index b557ae8..b373ecc 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -186,7 +186,7 @@
                 <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"/>
                 <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"
                        sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 52e5809..29de848 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -270,6 +270,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.multi_usb_mode=true
+
 # AudioProxy
 PRODUCT_PACKAGES += \
     libaudio_proxy.google \