commit 1b66c41f154155d09c892174d42912302eac9b56
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 14 22:28:10 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 14 22:28:10 2018 -0800
tree 3722f6f57add89644f528d10c51f588f0814afee
parent 1deba5a07c9931079f14ff67d1bb04436fafaf0c
parent 62968cefd157de38e350d2a139ca5113dae4d6c0

Merge "hal: USB headset support for native playback."

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 164bed7..2539ed1 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3261,7 +3261,8 @@
 
     if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
         out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET ||
-        out_device & AUDIO_DEVICE_OUT_LINE)
+        out_device & AUDIO_DEVICE_OUT_LINE ||
+        out_device & AUDIO_DEVICE_OUT_USB_HEADSET)
         ret = true;
 
     return ret;
@@ -6277,7 +6278,8 @@
         /*reset sample rate to 48khz if sample rate less than 44.1khz, or device backend dose not support 44.1 khz*/
         if ((sample_rate == OUTPUT_SAMPLING_RATE_44100 &&
              backend_idx != HEADPHONE_44_1_BACKEND &&
-             backend_idx != HEADPHONE_BACKEND) ||
+             backend_idx != HEADPHONE_BACKEND &&
+             backend_idx != USB_AUDIO_RX_BACKEND) ||
             sample_rate < OUTPUT_SAMPLING_RATE_44100) {
             sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
             ALOGD("%s:becf: afe: set sample rate to default Sample Rate(48k)",__func__);