diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index bd031ea..4be21b1 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1378,8 +1378,8 @@
             effectCreated = true;
 
             // FIXME: use vector of device and address when effect interface is ready.
-            effect->setDevice(deviceTypesToBitMask(outDeviceTypes()));
-            effect->setDevice(inDeviceType());
+            effect->setDevices(outDeviceTypeAddrs());
+            effect->setInputDevice(inDeviceTypeAddr());
             effect->setMode(mAudioFlinger->getMode());
             effect->setAudioSource(mAudioSource);
         }
@@ -1495,8 +1495,8 @@
         return status;
     }
 
-    effect->setDevice(deviceTypesToBitMask(outDeviceTypes()));
-    effect->setDevice(inDeviceType());
+    effect->setDevices(outDeviceTypeAddrs());
+    effect->setInputDevice(inDeviceTypeAddr());
     effect->setMode(mAudioFlinger->getMode());
     effect->setAudioSource(mAudioSource);
 
@@ -4070,7 +4070,7 @@
 #endif
 
     for (size_t i = 0; i < mEffectChains.size(); i++) {
-        mEffectChains[i]->setDevice_l(type);
+        mEffectChains[i]->setDevices_l(deviceTypeAddrs);
     }
 
     // mPatch.num_sinks is not set when the thread is created so that
@@ -8321,7 +8321,7 @@
     mInDeviceTypeAddr.mAddress = patch->sources[0].ext.device.address;
     audio_port_handle_t deviceId = patch->sources[0].id;
     for (size_t i = 0; i < mEffectChains.size(); i++) {
-        mEffectChains[i]->setDevice_l(mInDeviceTypeAddr.mType);
+        mEffectChains[i]->setInputDevice_l(inDeviceTypeAddr());
     }
 
     checkBtNrec_l();
@@ -8391,7 +8391,7 @@
     mOutDevices = outDevices;
     mOutDeviceTypeAddrs = deviceTypeAddrsFromDescriptors(mOutDevices);
     for (size_t i = 0; i < mEffectChains.size(); i++) {
-        mEffectChains[i]->setDevice_l(deviceTypesToBitMask(outDeviceTypes()));
+        mEffectChains[i]->setDevices_l(outDeviceTypeAddrs());
     }
 }
 
@@ -8922,7 +8922,11 @@
     }
 
     for (size_t i = 0; i < mEffectChains.size(); i++) {
-        mEffectChains[i]->setDevice_l(type);
+        if (isOutput()) {
+            mEffectChains[i]->setDevices_l(sinkDeviceTypeAddrs);
+        } else {
+            mEffectChains[i]->setInputDevice_l(sourceDeviceTypeAddr);
+        }
     }
 
     if (!isOutput()) {
