commit 8637747fab82a99325aae69755646e96fe2e62a5
author Glenn Kasten <gkasten@google.com> Thu Feb 21 11:08:17 2013 -0800
committer Glenn Kasten <gkasten@google.com> Thu Feb 21 11:08:17 2013 -0800
tree 7b7c19c6b26a073608a409072052f2db66ec6098
parent 8455fa7d7e51680e45b6a88d28cf48074280e2f9

Fix routing for wired headset

Bug: 8239898
Change-Id: Id001206b2e5aa441340b38d62fbcee7449cf5cba

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index b3d236f..d5ed155 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -370,6 +370,9 @@
         } else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET |
                                AUDIO_DEVICE_OUT_SPEAKER)) {
             snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+        } else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET |
+                               AUDIO_DEVICE_OUT_WIRED_HEADPHONE)) {
+            snd_device = SND_DEVICE_OUT_HEADPHONES;
         } else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL |
                                AUDIO_DEVICE_OUT_SPEAKER)) {
             snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
@@ -381,6 +384,18 @@
             goto exit;
         }
     }
+
+    if (popcount(devices) == 3) {
+        if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
+                        AUDIO_DEVICE_OUT_WIRED_HEADSET |
+                        AUDIO_DEVICE_OUT_SPEAKER)) {
+            snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+        } else {
+            ALOGE("%s: Invalid combo device(0x%x)", __func__, devices);
+        }
+        goto exit;
+    }
+
     if (popcount(devices) != 1) {
         ALOGE("%s: Invalid output devices(0x%x)", __func__, devices);
         goto exit;