From 7ef2381f336dcb3c77ffa6875f6494631e9f799f Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Tue, 19 Dec 2023 15:26:14 +0800
Subject: [PATCH 1/2] audio: add immersive-offloaded-spatializer-playback using
 EP4

Bug: 307842941
Test: manual test
Change-Id: I838d6e1a029e2ed6b87a7796c25a4b91f2298374
---
 audio/husky/aidl_config/mixer_paths_aidl.xml | 62 +++++++++++++++++---
 audio/shiba/aidl_config/mixer_paths_aidl.xml | 62 +++++++++++++++++---
 2 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index d22b97c..790a3ff 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -830,6 +830,54 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
+  <path name="immersive-offloaded-spatializer-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback -> bt">
+    <ctl name="BT_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bt">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+    <ctl name="USB_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -986,14 +1034,11 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />
 
-  <path name="microphones -> hotword-lookback-capture-0">
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1167,7 +1212,6 @@
   <path name="speaker (VOICE)">
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -1396,8 +1440,8 @@
   </path>
 
   <path name="adapted-voice-earpiece">
-      <ctl name="Boost Peak Current Limit" value="3.50A" />
-      <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-earpiece-battery-throttled">
     <path name="adapted-voice-earpiece" />
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index d22b97c..790a3ff 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -830,6 +830,54 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
+  <path name="immersive-offloaded-spatializer-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback -> bt">
+    <ctl name="BT_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bt">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+    <ctl name="USB_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -986,14 +1034,11 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />
 
-  <path name="microphones -> hotword-lookback-capture-0">
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1167,7 +1212,6 @@
   <path name="speaker (VOICE)">
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -1396,8 +1440,8 @@
   </path>
 
   <path name="adapted-voice-earpiece">
-      <ctl name="Boost Peak Current Limit" value="3.50A" />
-      <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-earpiece-battery-throttled">
     <path name="adapted-voice-earpiece" />

From d9a3d4d7dd4c949bdd0c5952ebe231c9012b3b26 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 20 Dec 2023 22:05:00 +0000
Subject: [PATCH 2/2] Fix lunch choices for git_main

We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Bug: 317213158
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:748a543cf5b95a759cb9525388ad310c1108bd8a)
Merged-In: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
Change-Id: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
---
 AndroidProducts.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4e79d41..b343f20 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -28,6 +28,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_shiba.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_ripcurrent-userdebug \
-    aosp_husky-userdebug \
-    aosp_shiba-userdebug
+    aosp_ripcurrent-trunk_staging-userdebug \
+    aosp_husky-trunk_staging-userdebug \
+    aosp_shiba-trunk_staging-userdebug