commit 30c8c36ea54575f52f0ce0e17666b9a171285543
author Sebastian Pickl <spickl@google.com> Fri Apr 21 08:29:27 2023 +0000
committer Sebastian Pickl <spickl@google.com> Fri Apr 21 12:14:54 2023 +0000
tree 259d19860dd4692847572fd1313883f7ccd8e166
parent 4b7f1de3e560c0ba10242942b83172bd92945501

Revert "Move EffectsConfig loading in AudioPolicyEffects to libAudioHal"

This reverts commit e3e403d4598c5460baffeba766f469eceafd91e5.

Reason for revert: fixes b/279127394 validated by http://go/abtd-run/L71300000960106239 and b/279108570

Change-Id: I58054d98365a6bf10b4dab2f347d4ee78205440c

media/libaudiohal/impl/EffectsFactoryHalAidl.cpp

diff --git a/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp b/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
index 918d419..bc05aa0 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
+++ b/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
@@ -23,7 +23,6 @@
 //#define LOG_NDEBUG 0
 
 #include <error/expected_utils.h>
-#include <aidl/android/media/audio/common/AudioStreamType.h>
 #include <android/binder_manager.h>
 #include <media/AidlConversionCppNdk.h>
 #include <media/AidlConversionEffect.h>
@@ -36,13 +35,11 @@
 #include "EffectsFactoryHalAidl.h"
 
 using ::aidl::android::legacy2aidl_audio_uuid_t_AudioUuid;
-using ::aidl::android::aidl_utils::statusTFromBinderStatus;
-using ::aidl::android::hardware::audio::effect::Descriptor;
-using ::aidl::android::hardware::audio::effect::IFactory;
-using ::aidl::android::hardware::audio::effect::Processing;
-using ::aidl::android::media::audio::common::AudioUuid;
-using ::android::base::unexpected;
-using ::android::detail::AudioHalVersionInfo;
+using aidl::android::aidl_utils::statusTFromBinderStatus;
+using aidl::android::hardware::audio::effect::Descriptor;
+using aidl::android::hardware::audio::effect::IFactory;
+using aidl::android::media::audio::common::AudioUuid;
+using android::detail::AudioHalVersionInfo;
 
 namespace android {
 namespace effect {
@@ -95,8 +92,7 @@
                        [](const Descriptor& desc) { return !desc.common.id.proxy.has_value(); });
           return list;
       }()),
-      mEffectCount(mNonProxyDescList.size() + mProxyDescList.size()),
-      mEffectProcessings(INVALID_EFFECT_PROCESSING) {
+      mEffectCount(mNonProxyDescList.size() + mProxyDescList.size()) {
     ALOG_ASSERT(mFactory != nullptr, "Provided IEffectsFactory service is NULL");
     ALOGI("%s with %zu nonProxyEffects and %zu proxyEffects", __func__, mNonProxyDescList.size(),
           mProxyDescList.size());
@@ -273,10 +269,6 @@
     return 0 != mUuidProxyMap.count(uuid);
 }
 
-const effectsConfig::EffectProcessings& EffectsFactoryHalAidl::getProcessings() const {
-    return mEffectProcessings;
-}
-
 } // namespace effect
 
 // When a shared library is built from a static library, even explicit