commit 89c22e499a3df21200b4da20f3bc78da492315f3
author Mikhail Naganov <mnaganov@google.com> Wed Jun 14 15:49:59 2023 -0700
committer Shunkai Yao <yaoshunkai@google.com> Thu Jun 15 01:55:03 2023 +0000
tree 2aa68811da3f3e82005a5d57c678344c3985470a
parent 79f98745af22b2924c0975fbf97036a4f1c8f1d7

Clean up EffectHalInterface

Remove `isLocal`, it's a legacy from the HIDL transition times.

Make `effectId` specific to EffectHalHidl, remove usages
outside of libaudiohal.

Bug: 205884982
Test: m
Change-Id: I0486d5fb48d8cfce46aca9152136e7a1a68cf215

media/libaudiohal/impl/StreamHalHidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalHidl.cpp b/media/libaudiohal/impl/StreamHalHidl.cpp
index 82062cc..72eadc6 100644
--- a/media/libaudiohal/impl/StreamHalHidl.cpp
+++ b/media/libaudiohal/impl/StreamHalHidl.cpp
@@ -33,6 +33,7 @@
 #include <util/CoreUtils.h>
 
 #include "DeviceHalHidl.h"
+#include "EffectHalHidl.h"
 #include "ParameterUtils.h"
 #include "StreamHalHidl.h"
 
@@ -144,13 +145,15 @@
 status_t StreamHalHidl::addEffect(sp<EffectHalInterface> effect) {
     TIME_CHECK();
     if (!mStream) return NO_INIT;
-    return processReturn("addEffect", mStream->addEffect(effect->effectId()));
+    auto hidlEffect = sp<effect::EffectHalHidl>::cast(effect);
+    return processReturn("addEffect", mStream->addEffect(hidlEffect->effectId()));
 }
 
 status_t StreamHalHidl::removeEffect(sp<EffectHalInterface> effect) {
     TIME_CHECK();
     if (!mStream) return NO_INIT;
-    return processReturn("removeEffect", mStream->removeEffect(effect->effectId()));
+    auto hidlEffect = sp<effect::EffectHalHidl>::cast(effect);
+    return processReturn("removeEffect", mStream->removeEffect(hidlEffect->effectId()));
 }
 
 status_t StreamHalHidl::standby() {