From ef2aca58fb9efd625b52078be9484a08898a7f5e Mon Sep 17 00:00:00 2001
From: millerliang <millerliang@google.com>
Date: Mon, 5 Sep 2022 11:35:20 +0800
Subject: [PATCH] audio: remove spatial audio configuraion in speaker path

Remove spatial audio configuration in speaker path
to match the rule.

Bug: 247415765
Test: spatial audio playback
Change-Id: Ib6de42e0cf9b97fb47781eb4fee9541c841b89c3
---
 audio/cheetah/config/audio_policy_configuration.xml             | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_le_offload_disabled.xml   | 2 +-
 audio/panther/config/audio_policy_configuration.xml             | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_le_offload_disabled.xml   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml
index 98467c4..2180a8a 100644
--- a/audio/cheetah/config/audio_policy_configuration.xml
+++ b/audio/cheetah/config/audio_policy_configuration.xml
@@ -202,7 +202,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"
diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 5e7514d..f5c129f 100644
--- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -175,7 +175,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"
diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
index 675d804..7cf76e6 100644
--- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
@@ -190,7 +190,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"
diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml
index 98467c4..2180a8a 100644
--- a/audio/panther/config/audio_policy_configuration.xml
+++ b/audio/panther/config/audio_policy_configuration.xml
@@ -202,7 +202,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"
diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 5e7514d..f5c129f 100644
--- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -175,7 +175,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"
diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
index 675d804..7cf76e6 100644
--- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
@@ -190,7 +190,7 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload,immersive_out"/>
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="Earpiece"