commit d11000130cee7693984960973c4c18cddfe2d418
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 06 07:25:13 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 06 07:25:13 2017 +0000
tree bd26f5f1c9e613826f04c9230782aa7a38174011
parent 96848d927e8ea6cc449fcac68c92a848828a7457
parent 2359aef4f2d6dfb236f66b3665fc5e62ad17dd77

release-request-60f1fc0d-1c6d-400a-8b4e-444f1452f036-for-git_oc-mr1-release-4157261 snap-temp-L11100000079944679

Change-Id: Iede357b1c0cf2903d7cf17fef2a8eba6a5d0d759

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