commit 7a1a6a96e0b8a022f4d2ee4261dde1801b6f00e9
author Glenn Kasten <gkasten@google.com> Fri Feb 22 23:05:16 2013 +0000
committer The Android Automerger <android-build@android.com> Fri Feb 22 17:50:12 2013 -0800
tree 5c8e4aae85367dcf64901ac0d96af20cb9b34cee
parent 778bf121b16f3bd87d4c8b4deaa577f5d2061733

Revert "Fix routing for wired headset"

This reverts commit 8637747fab82a99325aae69755646e96fe2e62a5

Change-Id: I59073d3e47548a5697b61a5691b2506bf5876e5e

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 29a36ad..36714bf 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -370,9 +370,6 @@
         } 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;
@@ -384,18 +381,6 @@
             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;