From cfaa3174c3ad3b706a3ee146b62daea1cc19c7ac Mon Sep 17 00:00:00 2001
From: Roger Fang <rogerfang@google.com>
Date: Tue, 3 Aug 2021 09:33:29 +0000
Subject: [PATCH] audio: Add command to set PCM steam wait time for voice and
 audio.

This control is from this patch: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/1962616/

Bug: 194454077
Test: Playing a music then removing the USB headset
Change-Id: Ie9dbf9df13ffaee80c61e2d5da529878fde0b740
Signed-off-by: Roger Fang <rogerfang@google.com>
---
 audio/oriole/config/mixer_paths.xml   | 3 ++-
 audio/raven/config/mixer_paths.xml    | 3 ++-
 audio/slider/config/mixer_paths.xml   | 3 ++-
 audio/whitefin/config/mixer_paths.xml | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index b45c48d..5f271c1 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -27,7 +27,8 @@
 <mixer>
     <!-- Initial default value of ALSA command -->
     <!-- PCM timeout -->
-    <ctl name="PCM Stream Wait Time in MSec" value="500"/>
+    <ctl name="PCM Stream Wait Time in MSec" value="100"/>
+    <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index b45c48d..5f271c1 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -27,7 +27,8 @@
 <mixer>
     <!-- Initial default value of ALSA command -->
     <!-- PCM timeout -->
-    <ctl name="PCM Stream Wait Time in MSec" value="500"/>
+    <ctl name="PCM Stream Wait Time in MSec" value="100"/>
+    <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 7fb6ac5..467a1ff 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -27,7 +27,8 @@
 <mixer>
     <!-- Initial default value of ALSA command -->
     <!-- PCM timeout -->
-    <ctl name="PCM Stream Wait Time in MSec" value="500"/>
+    <ctl name="PCM Stream Wait Time in MSec" value="100"/>
+    <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 7612825..9b297ff 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -27,7 +27,8 @@
 <mixer>
     <!-- Initial default value of ALSA command -->
     <!-- PCM timeout -->
-    <ctl name="PCM Stream Wait Time in MSec" value="500"/>
+    <ctl name="PCM Stream Wait Time in MSec" value="100"/>
+    <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>