commit f07e5e153fb003aba4c9735d154f082c5b41d7dd
author Linux Build Service Account <lnxbuild@localhost> Mon May 19 02:05:01 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 19 02:05:01 2014 -0700
tree 5dad2bccb9fcaf081ebbc8d7d815cd33dda32c03
parent d2c85b9938c394b9522894640e0320fe63bf1a0a
parent 5cf8c1a93863f7727d2781af18d30cdc0ecec57f

Merge "hal: Fix teardown during back to back pause/play of WFD session"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 64842a1..949e4ff 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -193,8 +193,16 @@
             // do not force device change on duplicated output because if device is 0, it will
             // also force a device 0 for the two outputs it is duplicated to which may override
             // a valid device selection on those outputs.
+            audio_devices_t cachedDevice = getNewDevice(mOutputs.keyAt(i), true /*fromCache*/);
+            AudioOutputDescriptor *desc = mOutputs.valueFor(mOutputs.keyAt(i));
+            if (cachedDevice == AUDIO_DEVICE_OUT_SPEAKER &&
+                device == AUDIO_DEVICE_OUT_PROXY &&
+                (desc->mFlags & AUDIO_OUTPUT_FLAG_FAST)) {
+                    ALOGI("Avoid routing touch tone to spkr as proxy is being disconnected");
+                    break;
+            }
             setOutputDevice(mOutputs.keyAt(i),
-                            getNewDevice(mOutputs.keyAt(i), true /*fromCache*/),
+                            cachedDevice,
                             !mOutputs.valueAt(i)->isDuplicated(),
                             0);
         }