Merge "Fix issue 3400751."
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp
index 6a82a59..3082d45 100644
--- a/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
@@ -610,7 +610,7 @@
// store time at which the stream was stopped - see isStreamActive()
outputDesc->mStopTime[stream] = systemTime();
- setOutputDevice(output, getNewDevice(output));
+ setOutputDevice(output, getNewDevice(output), false, outputDesc->mLatency*2);
#ifdef WITH_A2DP
if (mA2dpOutput != 0 && !a2dpUsedForSonification() &&