diff --git a/services/audioflinger/DeviceEffectManager.cpp b/services/audioflinger/DeviceEffectManager.cpp
index 8e78e4a..480d16d 100644
--- a/services/audioflinger/DeviceEffectManager.cpp
+++ b/services/audioflinger/DeviceEffectManager.cpp
@@ -35,14 +35,14 @@
 using media::IEffectClient;
 
 void AudioFlinger::DeviceEffectManager::onCreateAudioPatch(audio_patch_handle_t handle,
-        const PatchPanel::Patch& patch) {
+        const IAfPatchPanel::Patch& patch) {
     ALOGV("%s handle %d mHalHandle %d device sink %08x",
             __func__, handle, patch.mHalHandle,
             patch.mAudioPatch.num_sinks > 0 ? patch.mAudioPatch.sinks[0].ext.device.type : 0);
     Mutex::Autolock _l(mLock);
     for (auto& effectProxies : mDeviceEffects) {
         for (auto& effect : effectProxies.second) {
-            status_t status = effect->onCreatePatch(handle, &patch); // TODO(b/288339104) void*
+            const status_t status = effect->onCreatePatch(handle, patch);
             ALOGV("%s Effect onCreatePatch status %d", __func__, status);
             ALOGW_IF(status == BAD_VALUE, "%s onCreatePatch error %d", __func__, status);
         }
@@ -60,15 +60,14 @@
 }
 
 void AudioFlinger::DeviceEffectManager::onUpdateAudioPatch(audio_patch_handle_t oldHandle,
-        audio_patch_handle_t newHandle, const PatchPanel::Patch& patch) {
+        audio_patch_handle_t newHandle, const IAfPatchPanel::Patch& patch) {
     ALOGV("%s oldhandle %d newHandle %d mHalHandle %d device sink %08x",
             __func__, oldHandle, newHandle, patch.mHalHandle,
             patch.mAudioPatch.num_sinks > 0 ? patch.mAudioPatch.sinks[0].ext.device.type : 0);
     Mutex::Autolock _l(mLock);
     for (auto& effectProxies : mDeviceEffects) {
         for (auto& effect : effectProxies.second) {
-            // TODO(b/288339104) void*
-            status_t status = effect->onUpdatePatch(oldHandle, newHandle, &patch);
+            const status_t status = effect->onUpdatePatch(oldHandle, newHandle, patch);
             ALOGV("%s Effect onUpdatePatch status %d", __func__, status);
             ALOGW_IF(status != NO_ERROR, "%s onUpdatePatch error %d", __func__, status);
         }
@@ -81,7 +80,7 @@
         const AudioDeviceTypeAddr& device,
         const sp<Client>& client,
         const sp<IEffectClient>& effectClient,
-        const std::map<audio_patch_handle_t, PatchPanel::Patch>& patches,
+        const std::map<audio_patch_handle_t, IAfPatchPanel::Patch>& patches,
         int *enabled,
         status_t *status,
         bool probe,
@@ -123,7 +122,7 @@
         if (lStatus == NO_ERROR) {
             lStatus = effect->addHandle(handle.get());
             if (lStatus == NO_ERROR) {
-                lStatus = effect->init(&patches); // TODO(b/288339104) void*
+                lStatus = effect->init(patches);
                 if (lStatus == NAME_NOT_FOUND) {
                     lStatus = NO_ERROR;
                 }