commit 2359aef4f2d6dfb236f66b3665fc5e62ad17dd77
author Eric Laurent <elaurent@google.com> Wed Jul 05 18:29:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 05 18:29:31 2017 +0000
tree bd26f5f1c9e613826f04c9230782aa7a38174011
parent 0d109d894cc83f6915f39e01de2de16deb4b5f01
parent 9076a7e54970af21f18937dbbdbd0bfa035a0109

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

Change-Id: Ic0399c1b30832cb44adb492cc7341fdd253798ba

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 22eb714..3a59cea 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2310,8 +2310,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);