commit 9076a7e54970af21f18937dbbdbd0bfa035a0109
author Eric Laurent <elaurent@google.com> Wed Jul 05 18:25:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 05 18:25:36 2017 +0000
tree 0ab68a58e9a1ef5d550f92f44bbce7020aba14c3
parent 3605cbb6e57d36beb74924480fee950899b9bdbf
parent d0f7c260da483857974e46ef91c0985a87bc4358

msm8974: Add missing combo device USB headset + Speaker safe
am: d0f7c260da

Change-Id: I1d6574d8e1bc0a8616ffa612b4800fb33664ea3d

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 459a5d4..3281d53 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2308,8 +2308,10 @@
                 (devices == (AUDIO_DEVICE_OUT_USB_HEADSET |
                                                AUDIO_DEVICE_OUT_SPEAKER))) {
             snd_device = SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET;
-        } else if (devices == (AUDIO_DEVICE_OUT_USB_DEVICE |
-                               AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
+        } else if ((devices == (AUDIO_DEVICE_OUT_USB_DEVICE |
+                               AUDIO_DEVICE_OUT_SPEAKER_SAFE)) ||
+                (devices == (AUDIO_DEVICE_OUT_USB_HEADSET |
+                                               AUDIO_DEVICE_OUT_SPEAKER_SAFE))) {
             snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET;
         } else {
             ALOGE("%s: Invalid combo device(%#x)", __func__, devices);