1 files changed, 2 insertions, 95 deletions

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index eead3ac..12cca65 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -116,7 +116,7 @@ void AudioPolicyService::onFirstRef()
 #endif
     }
     // load audio processing modules
-    sp<AudioPolicyEffects>audioPolicyEffects = new AudioPolicyEffects(this);
+    sp<AudioPolicyEffects>audioPolicyEffects = new AudioPolicyEffects();
     {
         Mutex::Autolock _l(mLock);
         mAudioPolicyEffects = audioPolicyEffects;
@@ -177,23 +177,6 @@ void AudioPolicyService::setAudioPortCallbacksEnabled(bool enabled)
     mNotificationClients.valueFor(uid)->setAudioPortCallbacksEnabled(enabled);
 }
 
-status_t AudioPolicyService::setEffectSessionCallbacksEnabled(bool enabled)
-{
-    Mutex::Autolock _l(mNotificationClientsLock);
-
-    uid_t uid = IPCThreadState::self()->getCallingUid();
-    if (mNotificationClients.indexOfKey(uid) < 0) {
-        return NO_INIT;
-    }
-    if (!modifyAudioRoutingAllowed()) {
-        ALOGE("setEffectSessionCallbacksEnabled requires MODIFY_AUDIO_ROUTING");
-        return PERMISSION_DENIED;
-    }
-    mNotificationClients.valueFor(uid)->setEffectSessionCallbacksEnabled(enabled);
-    return OK;
-}
-
-
 // removeNotificationClient() is called when the client process dies.
 void AudioPolicyService::removeNotificationClient(uid_t uid)
 {
@@ -271,37 +254,11 @@ status_t AudioPolicyService::clientSetAudioPortConfig(const struct audio_port_co
     return mAudioCommandThread->setAudioPortConfigCommand(config, delayMs);
 }
 
-void AudioPolicyService::onOutputSessionEffectsUpdate(audio_stream_type_t stream,
-                                                      audio_session_t sessionId,
-                                                      audio_output_flags_t flags,
-                                                      audio_channel_mask_t channelMask,
-                                                      uid_t uid, bool added)
-{
-    ALOGV("AudioPolicyService::onOutputSessionEffectsUpdate(%d, %d, %d)",
-            stream, sessionId, added);
-    mOutputCommandThread->effectSessionUpdateCommand(stream, sessionId,
-            flags, channelMask, uid, added);
-}
-
-void AudioPolicyService::doOnOutputSessionEffectsUpdate(audio_stream_type_t stream,
-                                                        audio_session_t sessionId,
-                                                        audio_output_flags_t flags,
-                                                        audio_channel_mask_t channelMask,
-                                                        uid_t uid, bool added)
-{
-    Mutex::Autolock _l(mNotificationClientsLock);
-    for (size_t i = 0; i < mNotificationClients.size(); i++) {
-        mNotificationClients.valueAt(i)->onOutputSessionEffectsUpdate(stream, sessionId,
-                flags, channelMask, uid, added);
-    }
-}
-
 AudioPolicyService::NotificationClient::NotificationClient(const sp<AudioPolicyService>& service,
                                                      const sp<IAudioPolicyServiceClient>& client,
                                                      uid_t uid)
     : mService(service), mUid(uid), mAudioPolicyServiceClient(client),
-      mAudioPortCallbacksEnabled(false),
-      mEffectSessionCallbacksEnabled(false)
+      mAudioPortCallbacksEnabled(false)
 {
 }
 
@@ -332,17 +289,6 @@ void AudioPolicyService::NotificationClient::onAudioPatchListUpdate()
     }
 }
 
-void AudioPolicyService::NotificationClient::onOutputSessionEffectsUpdate(
-        audio_stream_type_t stream, audio_session_t sessionId,
-        audio_output_flags_t flags, audio_channel_mask_t channelMask,
-        uid_t uid, bool added)
-{
-    if (mAudioPolicyServiceClient != 0 && mEffectSessionCallbacksEnabled) {
-        mAudioPolicyServiceClient->onOutputSessionEffectsUpdate(stream, sessionId,
-                flags, channelMask, uid, added);
-    }
-}
-
 void AudioPolicyService::NotificationClient::onDynamicPolicyMixStateUpdate(
         String8 regId, int32_t state)
 {
@@ -356,10 +302,6 @@ void AudioPolicyService::NotificationClient::setAudioPortCallbacksEnabled(bool e
     mAudioPortCallbacksEnabled = enabled;
 }
 
-void AudioPolicyService::NotificationClient::setEffectSessionCallbacksEnabled(bool enabled)
-{
-    mEffectSessionCallbacksEnabled = enabled;
-}
 
 void AudioPolicyService::binderDied(const wp<IBinder>& who) {
     ALOGW("binderDied() %p, calling pid %d", who.unsafe_get(),
@@ -637,21 +579,6 @@ bool AudioPolicyService::AudioCommandThread::threadLoop()
                     svc->doOnDynamicPolicyMixStateUpdate(data->mRegId, data->mState);
                     mLock.lock();
                     } break;
-                case EFFECT_SESSION_UPDATE: {
-                    EffectSessionUpdateData *data =
-                            (EffectSessionUpdateData *)command->mParam.get();
-                    ALOGV("AudioCommandThread() processing effect session update %d %d %d",
-                            data->mStream, data->mSessionId, data->mAdded);
-                    svc = mService.promote();
-                    if (svc == 0) {
-                        break;
-                    }
-                    mLock.unlock();
-                    svc->doOnOutputSessionEffectsUpdate(data->mStream, data->mSessionId,
-                            data->mFlags, data->mChannelMask, data->mUid, data->mAdded);
-                    mLock.lock();
-                    } break;
-
                 default:
                     ALOGW("AudioCommandThread() unknown command %d", command->mCommand);
                 }
@@ -924,26 +851,6 @@ void AudioPolicyService::AudioCommandThread::dynamicPolicyMixStateUpdateCommand(
     sendCommand(command);
 }
 
-void AudioPolicyService::AudioCommandThread::effectSessionUpdateCommand(
-        audio_stream_type_t stream, audio_session_t sessionId,
-        audio_output_flags_t flags, audio_channel_mask_t channelMask,
-        uid_t uid, bool added)
-{
-    sp<AudioCommand> command = new AudioCommand();
-    command->mCommand = EFFECT_SESSION_UPDATE;
-    EffectSessionUpdateData *data = new EffectSessionUpdateData();
-    data->mStream = stream;
-    data->mSessionId = sessionId;
-    data->mFlags = flags;
-    data->mChannelMask = channelMask;
-    data->mUid = uid;
-    data->mAdded = added;
-    command->mParam = data;
-    ALOGV("AudioCommandThread() sending effect session update (id=%d) for stream %d (added=%d)",
-            stream, sessionId, added);
-    sendCommand(command);
-}
-
 status_t AudioPolicyService::AudioCommandThread::sendCommand(sp<AudioCommand>& command, int delayMs)
 {
     {