Revert "Reapply "AudioFlinger: Control volume using Port ID""
This reverts commit af273c6817b7e6b004034aad4f451eb87273dd62.
Reason for revert: DroidMonitor. Potential culprit for http://b/361843371 - verifying through ABTD session before submission.
Change-Id: I21918f26c06793cab65b7052c429aa7249dc489f
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 55f74e1..3602e94 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -322,18 +322,6 @@
return NO_ERROR;
}
-status_t AudioSystem::setPortsVolume(
- const std::vector<audio_port_handle_t>& portIds, float volume, audio_io_handle_t output) {
- const sp<IAudioFlinger> af = get_audio_flinger();
- if (af == 0) return PERMISSION_DENIED;
- std::vector<int32_t> portIdsAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<int32_t>>(
- portIds, legacy2aidl_audio_port_handle_t_int32_t));
- int32_t outputAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(output));
- af->setPortsVolume(portIdsAidl, volume, outputAidl);
- return NO_ERROR;
-}
-
status_t AudioSystem::setMode(audio_mode_t mode) {
if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE;
const sp<IAudioFlinger> af = get_audio_flinger();
@@ -1093,8 +1081,7 @@
audio_port_handle_t* portId,
std::vector<audio_io_handle_t>* secondaryOutputs,
bool *isSpatialized,
- bool *isBitPerfect,
- float *volume) {
+ bool *isBitPerfect) {
if (attr == nullptr) {
ALOGE("%s NULL audio attributes", __func__);
return BAD_VALUE;
@@ -1160,7 +1147,6 @@
*isBitPerfect = responseAidl.isBitPerfect;
*attr = VALUE_OR_RETURN_STATUS(
aidl2legacy_AudioAttributes_audio_attributes_t(responseAidl.attr));
- *volume = responseAidl.volume;
return OK;
}