commit d0f7c260da483857974e46ef91c0985a87bc4358
author Eric Laurent <elaurent@google.com> Wed Jul 05 09:09:12 2017 -0700
committer Eric Laurent <elaurent@google.com> Wed Jul 05 09:09:12 2017 -0700
tree 0ab68a58e9a1ef5d550f92f44bbce7020aba14c3
parent 96483a2f0d29db67d9246a66c6e4cb4874185742

msm8974: Add missing combo device USB headset + Speaker safe

Bug: 63287836
Test: call phone and check ringtone on both speaker and USB headset
Change-Id: Ief0b81d9b20e8ef4f36fba0fa36293b5b14716eb

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);