commit d3e99d20da87b3a8f0bae64e16f916c0fde85098
author Liana Kazanova (xWF) <lkazanova@google.com> Fri Aug 23 22:15:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 23 22:15:51 2024 +0000
tree 209c5b630f30cb7087cc9c1fec234dca873aa30c
parent af273c6817b7e6b004034aad4f451eb87273dd62

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

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);