commit 277a37ea5c5a5636740131c71a38de7cddbf3544
author Eric Laurent <elaurent@google.com> Mon Jul 29 18:37:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 29 18:37:52 2024 +0000
tree 177309a20a91f18ced51ce7b8cca33705d5fcf11
parent 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d

Revert "AudioFlinger: Control volume using Port ID"

This reverts commit 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d.

Reason for revert: b/356164780

Change-Id: I8ffa2a3ef93f66379418344ee680b8c624843366

media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp

diff --git a/media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp b/media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp
index 710a656..4c94974 100644
--- a/media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp
+++ b/media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp
@@ -26,7 +26,6 @@
 #include <android/content/AttributionSourceState.h>
 #include <binder/IServiceManager.h>
 #include <binder/MemoryDealer.h>
-#include <com_android_media_audioserver.h>
 #include <media/AidlConversion.h>
 #include <media/AudioEffect.h>
 #include <media/AudioRecord.h>
@@ -42,8 +41,6 @@
 constexpr int32_t kMaxSampleRateHz = 192000;
 constexpr int32_t kSampleRateUnspecified = 0;
 
-namespace audioserver_flags = com::android::media::audioserver;
-
 using namespace std;
 using namespace android;
 
@@ -504,19 +501,13 @@
     AudioSystem::getMasterMute(&state);
     AudioSystem::isMicrophoneMuted(&state);
 
-    audio_stream_type_t stream ;
-    if (!audioserver_flags::portid_volume_management()) {
-        stream = getValue(&mFdp, kStreamtypes);
-        AudioSystem::setStreamMute(getValue(&mFdp, kStreamtypes), mFdp.ConsumeBool());
+    audio_stream_type_t stream = getValue(&mFdp, kStreamtypes);
+    AudioSystem::setStreamMute(getValue(&mFdp, kStreamtypes), mFdp.ConsumeBool());
 
-        stream = getValue(&mFdp, kStreamtypes);
-        AudioSystem::setStreamVolume(stream, mFdp.ConsumeFloatingPoint<float>(),
-                                     mFdp.ConsumeIntegral<int32_t>());
-    } else {
-        std::vector <audio_port_handle_t> portsForVolumeChange{};
-        AudioSystem::setPortsVolume(portsForVolumeChange, mFdp.ConsumeFloatingPoint<float>(),
-                                    mFdp.ConsumeIntegral<int32_t>());
-    }
+    stream = getValue(&mFdp, kStreamtypes);
+    AudioSystem::setStreamVolume(stream, mFdp.ConsumeFloatingPoint<float>(),
+                                 mFdp.ConsumeIntegral<int32_t>());
+
     audio_mode_t mode = getValue(&mFdp, kModes);
     AudioSystem::setMode(mode);