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

Change-Id: I8a46ba81d6055e097c7328a79e9d945ad83bda81
4 years ago · 8d386f779d
parent c7c50f47ce 7f82d1a74e
commit 8d386f779d
1 changed files with 4 additions and 1 deletions
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@ -5710,7 +5710,10 @@ uint32_t AudioPolicyManager::setOutputDevices(const sp<SwAudioOutputDescriptor>&
            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