commit 74c5a53980f0c5dfa5a193383f905cb0dbf3762c
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 03 07:45:40 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 03 07:45:40 2015 -0700
tree 8b50f48661f34ac13527bc31a1dd775509a61e22
parent cfa4fbd6d5c82352b9b36da2ea44d5cbff9591d2
parent 65a9e1d17c2d6b03c0a05e03b0bf84148f544a2d

Merge "hal: use ANC devices when ANC is enabled for Native streams"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index eb6b07d..c632a82 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2528,7 +2528,8 @@
     if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
         devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
         if (OUTPUT_SAMPLING_RATE_44100 == sample_rate &&
-            platform_get_native_support()) {
+            platform_get_native_support() &&
+            !audio_extn_get_anc_enabled()) {
             snd_device = SND_DEVICE_OUT_HEADPHONES_44_1;
         }else if (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET
             && audio_extn_get_anc_enabled()) {