diff options
| author | Eric Laurent <elaurent@google.com> | 2012-06-07 09:12:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 09:12:33 -0700 |
| commit | 5d379e191e895a67e876cf2d2708c2b9d3f4c831 (patch) | |
| tree | affb22e5d7eb0b585f58e99a6ac1ece071881283 | |
| parent | 5e17e058373a44b7f5b8b462c6efe08b682861d7 (diff) | |
| parent | fa3697d716b444bbea6be480801536c44bf69214 (diff) | |
| download | hardware_libhardware_legacy-5d379e191e895a67e876cf2d2708c2b9d3f4c831.zip hardware_libhardware_legacy-5d379e191e895a67e876cf2d2708c2b9d3f4c831.tar.gz hardware_libhardware_legacy-5d379e191e895a67e876cf2d2708c2b9d3f4c831.tar.bz2 | |
am fa3697d7: audio policy: remove delay when enabling speaker
* commit 'fa3697d716b444bbea6be480801536c44bf69214':
audio policy: remove delay when enabling speaker
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 9522000..fcee6ae 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -1803,8 +1803,11 @@ void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy) strategy, srcOutputs[0], dstOutputs[0]); // mute strategy while moving tracks from one output to another for (size_t i = 0; i < srcOutputs.size(); i++) { - setStrategyMute(strategy, true, srcOutputs[i]); - setStrategyMute(strategy, false, srcOutputs[i], MUTE_TIME_MS, newDevice); + AudioOutputDescriptor *desc = mOutputs.valueFor(srcOutputs[i]); + if (desc->strategyRefCount(strategy) != 0) { + setStrategyMute(strategy, true, srcOutputs[i]); + setStrategyMute(strategy, false, srcOutputs[i], MUTE_TIME_MS, newDevice); + } } // Move effects associated to this strategy from previous output to new output |