1 files changed, 9 insertions, 23 deletions

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 54b1982..c0d3866 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -18,7 +18,6 @@
 //#define LOG_NDEBUG 0
 
 #include <utils/Log.h>
-#include <media/AudioPolicyHelper.h>
 #include "AudioPolicyService.h"
 #include "ServiceUtilities.h"
 
@@ -163,29 +162,18 @@ status_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr,
         return NO_INIT;
     }
     ALOGV("getOutput()");
-    status_t status;
-    sp<AudioPolicyEffects> audioPolicyEffects;
-    {
-        Mutex::Autolock _l(mLock);
+    Mutex::Autolock _l(mLock);
 
-        // if the caller is us, trust the specified uid
-        if (IPCThreadState::self()->getCallingPid() != getpid_cached || uid == (uid_t)-1) {
-            uid_t newclientUid = IPCThreadState::self()->getCallingUid();
-            if (uid != (uid_t)-1 && uid != newclientUid) {
-                ALOGW("%s uid %d tried to pass itself off as %d", __FUNCTION__, newclientUid, uid);
-            }
-            uid = newclientUid;
+    // if the caller is us, trust the specified uid
+    if (IPCThreadState::self()->getCallingPid() != getpid_cached || uid == (uid_t)-1) {
+        uid_t newclientUid = IPCThreadState::self()->getCallingUid();
+        if (uid != (uid_t)-1 && uid != newclientUid) {
+            ALOGW("%s uid %d tried to pass itself off as %d", __FUNCTION__, newclientUid, uid);
         }
-        status = mAudioPolicyManager->getOutputForAttr(attr, output, session, stream, uid, samplingRate,
-                                 format, channelMask, flags, selectedDeviceId, offloadInfo);
-        audioPolicyEffects = mAudioPolicyEffects;
-    }
-
-    if (audioPolicyEffects != 0) {
-        audioPolicyEffects->doAddOutputSessionEffects(*output, *stream, session, flags, channelMask, uid);
+        uid = newclientUid;
     }
-
-	return status;
+    return mAudioPolicyManager->getOutputForAttr(attr, output, session, stream, uid, samplingRate,
+                                    format, channelMask, flags, selectedDeviceId, offloadInfo);
 }
 
 status_t AudioPolicyService::startOutput(audio_io_handle_t output,
@@ -282,8 +270,6 @@ void AudioPolicyService::doReleaseOutput(audio_io_handle_t output,
 {
     ALOGV("doReleaseOutput from tid %d", gettid());
     Mutex::Autolock _l(mLock);
-    onOutputSessionEffectsUpdate(stream, session,
-                        AUDIO_OUTPUT_FLAG_NONE, 0, -1, false);
     mAudioPolicyManager->releaseOutput(output, stream, session);
 }