commit 6d055f57fbe3681b04b8f579563f1f04093090cd
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 29 01:27:28 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Nov 29 01:27:28 2014 -0800
tree 523d7e05f248e8ce1dd4b94416b187a00385a842
parent 012520aa026eedec20cf8c9c50ab5936e24e234b
parent d5349cee039ca131edb329b36692c71e9bff1bc3

Merge "hal: Avoid resetting device to speaker for HDMI passthrough case"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7b8f697..ca5055b 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1811,7 +1811,8 @@
         if ((out->devices == AUDIO_DEVICE_OUT_AUX_DIGITAL ||
                 out->devices == AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET) &&
                 val == AUDIO_DEVICE_NONE) {
-            val = AUDIO_DEVICE_OUT_SPEAKER;
+            if (!audio_extn_dolby_is_passthrough_stream(out->flags))
+                val = AUDIO_DEVICE_OUT_SPEAKER;
         }
 
         /*