commit 44e5792ca7aa37c26c0ead01c59863323075ebbf
author Eric Laurent <elaurent@google.com> Mon Jul 01 07:48:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 01 07:48:56 2024 +0000
tree 78b76ecc57aee5e15b1bfda4e98f89f0e7cd4d1e
parent 2c71103319a0d1e483604da097acf121d03a410e
parent 64e868f2d464cf3fdc4f01a5c12c8913df9dce41

Merge "audio policy: fix absolute volume mute" into main

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 7d2dfbc..3a65376 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -8171,7 +8171,7 @@
             VolumeSource vsToDriveAbs = toVolumeSource(groupToDriveAbs);
             if (vsToDriveAbs == volumeSource) {
                 // attenuation is applied by the abs volume controller
-                return volumeDbMax;
+                return (index != 0) ? volumeDbMax : volumeDb;
             } else {
                 IVolumeCurves &curvesAbs = getVolumeCurves(vsToDriveAbs);
                 int indexAbs = curvesAbs.getVolumeIndex({volumeDevice});