commit 2e077f0fb2478163c82ca15b18b0fa67fabcb217
author Pechetty Sravani (xWF) <pechetty@google.com> Tue Aug 27 01:46:20 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 01:46:20 2024 +0000
tree 209c5b630f30cb7087cc9c1fec234dca873aa30c
parent 98c44f36c95fd01ffc6f44b894e41c3140b9ed7e

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

This reverts commit 98c44f36c95fd01ffc6f44b894e41c3140b9ed7e.

Reason for revert: Potential culprit for b/362363068- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ic97eda49fbcccc6e47357d17a552d24960a1a393

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 7cc6791..739e201 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1488,8 +1488,7 @@
                                               std::vector<audio_io_handle_t> *secondaryOutputs,
                                               output_type_t *outputType,
                                               bool *isSpatialized,
-                                              bool *isBitPerfect,
-                                              float *volume)
+                                              bool *isBitPerfect)
 {
     // The supplied portId must be AUDIO_PORT_HANDLE_NONE
     if (*portId != AUDIO_PORT_HANDLE_NONE) {
@@ -1545,8 +1544,6 @@
                                   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);