commit 13d2c8bb42a0d54ab0633ff6af50aeb381cba09d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 20 01:05:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 20 01:05:50 2021 +0000
tree 68be4199d9a8df950725857a8d26e75c5702d445
parent 44725cfc4babfff0dfeafe4653a750e7896ed36a
parent 46a8c116ada2c1ddad5ceec154831907ba0d89f7

Merge "C2SoftMp3Dec: fix floating point exception" am: 3992eb958f am: 606c6d5831 am: 46a8c116ad

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

Change-Id: I46199b3f87958c4d3a704e65c6d949c3b54a8e38

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) {