From e9fbea2a99426cbcd8d109baa91c63f27cbfbdb2 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 7 Apr 2021 20:14:33 +0800
Subject: [PATCH] audio: initialize mixer_control Incall Sink Mute and Incall
 Mic Mute

Bug: 177914228
Bug: 165750425
Bug: 180983997
Bug: 180984364
Test: call screen mode 2, mute microphone in voice call
Change-Id: I7535e6d2c9f739a0e2c7f867f4ca54430d587da0
---
 audio/oriole/config/mixer_paths.xml   | 5 +++++
 audio/raven/config/mixer_paths.xml    | 5 +++++
 audio/slider/config/mixer_paths.xml   | 5 +++++
 audio/whitefin/config/mixer_paths.xml | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index e7bb63e..cd1a40e 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -262,6 +262,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index d32e122..83d1faa 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -262,6 +262,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 4b47887..e5ec1e4 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -232,6 +232,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index d17b895..d571924 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -263,6 +263,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>