commit 5db490c0438f798bc27de77ab8a97e67571406bf
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 20 10:51:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 20 10:51:45 2021 +0000
tree 0162b1a84431421b467f0f65463d2a4b2ba55b97
parent 13d2c8bb42a0d54ab0633ff6af50aeb381cba09d
parent d6d5f88213c5aa685ea7e80a448c0526199750d3

Merge "Clean up ownership in frameworks/av/" am: c379052f4a am: 0a25665fc7 am: d6d5f88213

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1802716

Change-Id: Ia09a9eea0a843ef778d05d266566788c7b040bfb

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index cc2d8e8..cb9d700 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -6548,7 +6548,7 @@
     outputDesc->setVolume(
             volumeDb, volumeSource, curves.getStreamTypes(), deviceTypes, delayMs, force);
 
-    if (isVoiceVolSrc || isBtScoVolSrc) {
+    if (outputDesc == mPrimaryOutput && (isVoiceVolSrc || isBtScoVolSrc)) {
         float voiceVolume;
         // Force voice volume to max or mute for Bluetooth SCO as other attenuations are managed by the headset
         if (isVoiceVolSrc) {