commit 60c8814eae752fa06566692880d80a7c1efb8da8
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 06 05:01:48 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 06 05:01:48 2013 -0700
tree 57513ed9bbbd86fc1533f0048c3a8dac953c872a
parent 50094aa13e726f24470f215604a93f0fbbf76e23
parent 0cc5840b1cf40a44c09167b8e8752394c9f82f70

Merge "alsa_sound: primary desc check for sonification"

alsa_sound/AudioPolicyManagerALSA.cpp

diff --git a/alsa_sound/AudioPolicyManagerALSA.cpp b/alsa_sound/AudioPolicyManagerALSA.cpp
index aa3822c..e9f6e37 100644
--- a/alsa_sound/AudioPolicyManagerALSA.cpp
+++ b/alsa_sound/AudioPolicyManagerALSA.cpp
@@ -1376,7 +1376,8 @@
     } else if (isInCall() ||
                     outputDesc->isUsedByStrategy(STRATEGY_PHONE)) {
         device = getDeviceForStrategy(STRATEGY_PHONE, fromCache);
-    } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION)){
+    } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION)||
+                (primaryOutputDesc->isUsedByStrategy(STRATEGY_SONIFICATION)&& !primaryOutputDesc->strategyRefCount(STRATEGY_MEDIA))){
         device = getDeviceForStrategy(STRATEGY_SONIFICATION, fromCache);
     } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION_RESPECTFUL)) {
         device = getDeviceForStrategy(STRATEGY_SONIFICATION_RESPECTFUL, fromCache);