commit 453d78c3bd4bd706bf381a82788e0ed88d2f96d0
author SathishKumar Mani <smani@codeaurora.org> Fri Sep 21 20:12:08 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 26 12:24:21 2012 -0700
tree dbca8e4504d2f17ca719f8fed44971a491173797
parent 85f3fc5fd4b2b6ae79502c172148b9a27fda6fa5

alsa_sound: fix for output device routing during video chat

Bug: 7163358

- Output device for MODE_IN_COMMUNICATION could be earpiece
  or speaker, do not update output device in switchDevice()
  if input device is BUILTIN_MIC

Change-Id: I2a97a63f4cb57ef114695d3fd917282612b7a346
Signed-off-by: Iliyan Malchev <malchev@google.com>

alsa_sound/alsa_default.cpp

diff --git a/alsa_sound/alsa_default.cpp b/alsa_sound/alsa_default.cpp
index 32c7bac..ea8ad2f 100644
--- a/alsa_sound/alsa_default.cpp
+++ b/alsa_sound/alsa_default.cpp
@@ -376,10 +376,12 @@
         } else if (devices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE) {
             devices = devices | (AudioSystem::DEVICE_OUT_WIRED_HEADPHONE |
                       AudioSystem::DEVICE_IN_BUILTIN_MIC);
-        } else if ((devices & AudioSystem::DEVICE_OUT_EARPIECE) ||
-                  (devices & AudioSystem::DEVICE_IN_BUILTIN_MIC)) {
-            devices = devices | (AudioSystem::DEVICE_IN_BUILTIN_MIC |
-                      AudioSystem::DEVICE_OUT_EARPIECE);
+        } else if (devices & AudioSystem::DEVICE_IN_BUILTIN_MIC) {
+            if (mode == AudioSystem::MODE_IN_CALL) {
+                devices |= AudioSystem::DEVICE_OUT_EARPIECE;
+            }
+        } else if (devices & AudioSystem::DEVICE_OUT_EARPIECE) {
+            devices = devices | AudioSystem::DEVICE_IN_BUILTIN_MIC;
         } else if (devices & AudioSystem::DEVICE_OUT_SPEAKER) {
             devices = devices | (AudioSystem::DEVICE_IN_BACK_MIC |
                        AudioSystem::DEVICE_OUT_SPEAKER);
@@ -423,12 +425,14 @@
 
     if ((rxDevice != NULL) && (txDevice != NULL)) {
         if (((strncmp(rxDevice, curRxUCMDevice, MAX_STR_LEN)) ||
-             (strncmp(txDevice, curTxUCMDevice, MAX_STR_LEN))) && (mode == AudioSystem::MODE_IN_CALL))
+            (strncmp(txDevice, curTxUCMDevice, MAX_STR_LEN))) &&
+            ((mode == AudioSystem::MODE_IN_CALL)  ||
+            (mode == AudioSystem::MODE_IN_COMMUNICATION)))
             inCallDevSwitch = true;
     }
 
 #ifdef QCOM_CSDCLIENT_ENABLED
-    if (mode == AudioSystem::MODE_IN_CALL && platform_is_Fusion3() && (inCallDevSwitch == true)) {
+    if (platform_is_Fusion3() && (inCallDevSwitch == true)) {
         if (csd_disable_device == NULL) {
             ALOGE("dlsym:Error:%s Loading csd_client_disable_device", dlerror());
         } else {
@@ -528,7 +532,7 @@
     }
     ALOGD("switchDevice: curTxUCMDevivce %s curRxDevDevice %s", curTxUCMDevice, curRxUCMDevice);
 
-    if (mode == AudioSystem::MODE_IN_CALL && platform_is_Fusion3() && (inCallDevSwitch == true)) {
+    if (platform_is_Fusion3() && (inCallDevSwitch == true)) {
         /* get tx acdb id */
         memset(&ident,0,sizeof(ident));
         strlcpy(ident, "ACDBID/", sizeof(ident));