commit ff9407d5c6eb3598edc2dd2405fb0d3367e726d4
author Eric Laurent <elaurent@google.com> Fri May 11 01:56:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 11 01:56:14 2018 +0000
tree 2891a0fb38a687c814663d206c02456a5eb024ae
parent b1f8c80d3a0c144407d1bd6b63eb6ac9e90112f2
parent f60c824b23de449d3e31e69d5b91e3dba83067b1

Merge "audiopolicy: clean delayMs to 0 before reevaluate all outputs routing when call state changes" into pi-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e1467b7..d1d7530 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -596,7 +596,7 @@
         sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
         audio_devices_t newDevice = getNewOutputDevice(desc, true /*fromCache*/);
         if (state != AUDIO_MODE_IN_CALL || desc != mPrimaryOutput) {
-            setOutputDevice(desc, newDevice, (newDevice != AUDIO_DEVICE_NONE), delayMs);
+            setOutputDevice(desc, newDevice, (newDevice != AUDIO_DEVICE_NONE), 0 /*delayMs*/);
         }
     }