From 3f097bd11d249f49bbf010436b1635b6d4ba441e Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Tue, 11 Jun 2024 06:48:30 +0000
Subject: [PATCH] caimito: correct microphone devices for voip

note:
     In VOICE_COMMUNICATION case, microphones need
     extras string to be identified as voice device.

Bug: 346302191
Test: adb shell tinymix | grep "MIC HW Gain"
Change-Id: Ieb58ede838e457b7fcb4c17fb39515264f96514d
---
 audio/caiman/aidl_config/mixer_paths_aidl.xml | 8 ++++++++
 audio/komodo/aidl_config/mixer_paths_aidl.xml | 8 ++++++++
 audio/tokay/aidl_config/mixer_paths_aidl.xml  | 8 ++++++++
 3 files changed, 24 insertions(+)

diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index 6963798a..d7dc1bc6 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index 6963798a..d7dc1bc6 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index 6963798a..d7dc1bc6 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>