commit 8d386f779d76eb2a87ec570bf6ee3c0ce674085f
author Jasmine Cha <chajasmine@google.com> Wed Mar 18 06:51:02 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 18 06:51:02 2020 +0000
tree 23882c11fc70381e07df23e416d1eb101e1debdc
parent c7c50f47ce0998ea6d2ea5f40abc937fbde278e2
parent 7f82d1a74e77e0a89fd8431dbaf68f9b8e8b7118

audio policy: fix disordered sequence while changing device am: 7f82d1a74e

Change-Id: I8a46ba81d6055e097c7328a79e9d945ad83bda81

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5a012bf..ffc3a0f 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5710,7 +5710,10 @@
             patchBuilder.addSink(filteredDevice);
         }
 
-        installPatch(__func__, patchHandle, outputDesc.get(), patchBuilder.patch(), delayMs);
+        // Add half reported latency to delayMs when muteWaitMs is null in order
+        // to avoid disordered sequence of muting volume and changing devices.
+        installPatch(__func__, patchHandle, outputDesc.get(), patchBuilder.patch(),
+                muteWaitMs == 0 ? (delayMs + (outputDesc->latency() / 2)) : delayMs);
     }
 
     // update stream volumes according to new device