commit 1de6e5aac3120408a003dc8b5f7fdd68c40f436d
author Ravi Kumar Alamanda <ralama@codeaurora.org> Thu Jun 19 21:55:39 2014 -0500
committer Vineeta Srivastava <vsrivastava@google.com> Fri Jun 20 00:42:10 2014 -0700
tree 5115861ca7e1421a71a3fd4485f02d7cdf1ee28c
parent 299760a41231bd0f6d9991fb189977347365c72b

hal: Fix no voice call audio issue on handset

- Update the ACDB ids for voice handset sound device
- Fix incorrect condition check to add the backend name to
  mixer path.

Change-Id: Ie70ea20191c5563456cf5733f66847e6100e71ff

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index f89439e..471b143 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -170,8 +170,13 @@
     [SND_DEVICE_OUT_SPEAKER_REVERSE] = 15,
     [SND_DEVICE_OUT_HEADPHONES] = 10,
     [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,
+#ifdef PLATFORM_MSM8084
+    [SND_DEVICE_OUT_VOICE_HANDSET] = 67,
+    [SND_DEVICE_OUT_VOICE_SPEAKER] = 66,
+#else
     [SND_DEVICE_OUT_VOICE_HANDSET] = 7,
     [SND_DEVICE_OUT_VOICE_SPEAKER] = 15,
+#endif
     [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,
     [SND_DEVICE_OUT_HDMI] = 18,
     [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 15,
@@ -614,11 +619,12 @@
             strcat(mixer_path, " speaker");
         else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)
             strcat(mixer_path, " speaker-and-headphones");
-    } else if (my_data->ext_earpiece &&
-                 (snd_device == SND_DEVICE_OUT_VOICE_HANDSET ||
-                  snd_device == SND_DEVICE_OUT_VOICE_HANDSET_TMUS ||
-                  snd_device == SND_DEVICE_OUT_HANDSET ||
-                  snd_device == SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)) {
+    }
+    if (my_data->ext_earpiece &&
+        (snd_device == SND_DEVICE_OUT_VOICE_HANDSET ||
+         snd_device == SND_DEVICE_OUT_VOICE_HANDSET_TMUS ||
+         snd_device == SND_DEVICE_OUT_HANDSET ||
+         snd_device == SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)) {
         strcat(mixer_path, " handset");
     }
 }

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 42bf8e5..83d939c 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -103,8 +103,8 @@
 #define MUTE_SET 1
 #define VOLUME_CTL_PARAM_NUM 3
 
-#ifdef MSM8084
-#define ACDB_ID_VOICE_HANDSET_TMUS 88
+#ifdef PLATFORM_MSM8084
+#define ACDB_ID_VOICE_HANDSET_TMUS 67
 #define ACDB_ID_VOICE_DMIC_EF_TMUS 89
 #else
 #define ACDB_ID_VOICE_HANDSET_TMUS 7