diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2014-06-20 07:58:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 02:09:17 +0000 |
| commit | eb772b7725bda68b203b8e4469202db8b96162cc (patch) | |
| tree | 2bf96065b3c40448e4bae4cc8314811745f2b112 /hal | |
| parent | 24ca9ade8ff9550a1f30e28c6008e3b0832ab15f (diff) | |
| parent | 1de6e5aac3120408a003dc8b5f7fdd68c40f436d (diff) | |
| download | android_hardware_qcom_audio-eb772b7725bda68b203b8e4469202db8b96162cc.tar.gz android_hardware_qcom_audio-eb772b7725bda68b203b8e4469202db8b96162cc.tar.bz2 android_hardware_qcom_audio-eb772b7725bda68b203b8e4469202db8b96162cc.zip | |
Merge "hal: Fix no voice call audio issue on handset"
Diffstat (limited to 'hal')
| -rw-r--r-- | hal/msm8974/platform.c | 16 | ||||
| -rw-r--r-- | hal/msm8974/platform.h | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 5be6a384..f2c3c12c 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -176,8 +176,13 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { [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, @@ -617,11 +622,12 @@ void platform_add_backend_name(void *platform, char *mixer_path, 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"); } } diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h index 267f90f8..c713561a 100644 --- a/hal/msm8974/platform.h +++ b/hal/msm8974/platform.h @@ -97,8 +97,8 @@ enum { #define DEFAULT_MUTE_RAMP_DURATION_MS 20 #define DEFAULT_VOLUME_RAMP_DURATION_MS 20 -#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 |