commit 4b7f1de3e560c0ba10242942b83172bd92945501
author Sebastian Pickl <spickl@google.com> Fri Apr 21 08:31:51 2023 +0000
committer Sebastian Pickl <spickl@google.com> Fri Apr 21 12:14:25 2023 +0000
tree 11b90e8d8ddcb4e4fcdc0ea3221c535b13132138
parent bfb9b0d1a32c88496fad9d3a3048df50bf8a5161

Revert "Make EffectsFactoryHalHidl members const"

This reverts commit bfb9b0d1a32c88496fad9d3a3048df50bf8a5161.

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

Change-Id: Ia493da3f1b0843b095b751361cfb2b55e0f4c55f

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

diff --git a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
index bc3b375..483f643 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
+++ b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
@@ -80,20 +80,18 @@
 
 EffectsFactoryHalHidl::EffectsFactoryHalHidl(sp<IEffectsFactory> effectsFactory)
     : EffectConversionHelperHidl("EffectsFactory"),
-      mEffectsFactory(std::move(effectsFactory)),
       mCache(new EffectDescriptorCache),
-      mEffectProcessings(
-              [&]() -> effectsConfig::EffectProcessings {
-                  effectsConfig::EffectProcessings processings;
-                  const auto& parseResult = effectsConfig::parse();
-                  if (!parseResult.parsedConfig) {
-                      return INVALID_EFFECT_PROCESSING;
-                  }
-                  return {parseResult.nbSkippedElement, parseResult.parsedConfig->preprocess,
-                          parseResult.parsedConfig->postprocess,
-                          parseResult.parsedConfig->deviceprocess};
-              }()) {
+      mEffectProcessings([&]() -> effectsConfig::EffectProcessings {
+          effectsConfig::EffectProcessings processings;
+          const auto& parseResult = effectsConfig::parse();
+          if (!parseResult.parsedConfig) {
+              return INVALID_EFFECT_PROCESSING;
+          }
+          return {parseResult.nbSkippedElement, parseResult.parsedConfig->preprocess,
+                  parseResult.parsedConfig->postprocess, parseResult.parsedConfig->deviceprocess};
+      }()) {
     ALOG_ASSERT(effectsFactory != nullptr, "Provided IEffectsFactory service is NULL");
+    mEffectsFactory = std::move(effectsFactory);
 }
 
 status_t EffectsFactoryHalHidl::queryNumberEffects(uint32_t *pNumEffects) {