commit 98c44f36c95fd01ffc6f44b894e41c3140b9ed7e
author Andy Hung <hunga@google.com> Sat Aug 24 00:00:15 2024 +0000
committer Andy Hung <hunga@google.com> Sat Aug 24 00:01:19 2024 +0000
tree 7d3c19cead4d3ce0c68753a35da34195c1a1be00
parent d3e99d20da87b3a8f0bae64e16f916c0fde85098

Revert^2 "Reapply "AudioFlinger: Control volume using Port ID""

This reverts commit d3e99d20da87b3a8f0bae64e16f916c0fde85098.

Reason for revert: Internal project fixed with ag/28965993

Test: Treehugger
Bug: 361842578
Change-Id: I76427c29383fa1676de2c3635803a4f16ad9d552

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 739e201..7cc6791 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1488,7 +1488,8 @@
                                               std::vector<audio_io_handle_t> *secondaryOutputs,
                                               output_type_t *outputType,
                                               bool *isSpatialized,
-                                              bool *isBitPerfect)
+                                              bool *isBitPerfect,
+                                              float *volume)
 {
     // The supplied portId must be AUDIO_PORT_HANDLE_NONE
     if (*portId != AUDIO_PORT_HANDLE_NONE) {
@@ -1544,6 +1545,8 @@
                                   outputDesc->mPolicyMix);
     outputDesc->addClient(clientDesc);
 
+    *volume = Volume::DbToAmpl(outputDesc->getCurVolume(toVolumeSource(resultAttr)));
+
     ALOGV("%s() returns output %d requestedPortId %d selectedDeviceId %d for port ID %d", __func__,
           *output, requestedPortId, *selectedDeviceId, *portId);