commit bb0e0da128d4159c87472d9d7c8899cbac00ce46
author Eric Laurent <elaurent@google.com> Mon Feb 11 21:42:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 11 21:42:48 2013 +0000
tree 368fca5b55c396ba9a39b4138b1f3a054b342bc9
parent dc3bf1a37425697277f6ed04fc8cfe4a52fd678a
parent 8bf56b16e502b34826bc27e634534dcb9a8fb7dd

Merge "audio policy: fix in call audio setup delay"

audio/AudioPolicyManagerBase.cpp

diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 7fc1c1a..ed6ab16 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -350,12 +350,12 @@
     if (isStateInCall(state)) {
         for (size_t i = 0; i < mOutputs.size(); i++) {
             AudioOutputDescriptor *desc = mOutputs.valueAt(i);
-            //take the biggest latency for all outputs
-            if (delayMs < (int)desc->mLatency*2) {
-                delayMs = desc->mLatency*2;
-            }
-            //mute STRATEGY_MEDIA on all outputs
+            // mute strategy media and delay device switch by the largest latency of any output
+            // where strategy media is active.
             if (desc->strategyRefCount(STRATEGY_MEDIA) != 0) {
+                if (delayMs < (int)desc->mLatency*2) {
+                    delayMs = desc->mLatency*2;
+                }
                 setStrategyMute(STRATEGY_MEDIA, true, mOutputs.keyAt(i));
                 setStrategyMute(STRATEGY_MEDIA, false, mOutputs.keyAt(i), MUTE_TIME_MS,
                     getDeviceForStrategy(STRATEGY_MEDIA, true /*fromCache*/));