From 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Tue, 19 Apr 2016 02:41:45 -0700
Subject: audiopolicy: Clean up the mess

 * Since we're not using the policy directly to auto-attach,
   let's clean it up and remove the unused stuff.
 * Also fixes notifications for session release.

This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9.

Change-Id: Ibe65f427773c6ef012dde4f289d10e4089c094ea
---
 .../audiopolicy/service/AudioPolicyService.cpp     | 76 ----------------------
 1 file changed, 76 deletions(-)

(limited to 'services/audiopolicy/service/AudioPolicyService.cpp')

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 0e871c2..eead3ac 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -366,13 +366,6 @@ void AudioPolicyService::binderDied(const wp<IBinder>& who) {
             IPCThreadState::self()->getCallingPid());
 }
 
-void AudioPolicyService::releaseOutputSessionEffectsDelayed(
-        audio_io_handle_t output, audio_stream_type_t stream,
-        audio_unique_id_t sessionId, int delayMs)
-{
-    mAudioCommandThread->releaseOutputSessionEffectsCommand(output, stream, sessionId, delayMs);
-}
-
 static bool tryLock(Mutex& mutex)
 {
     bool locked = false;
@@ -658,35 +651,6 @@ bool AudioPolicyService::AudioCommandThread::threadLoop()
                             data->mFlags, data->mChannelMask, data->mUid, data->mAdded);
                     mLock.lock();
                     } break;
-                case RELEASE_OUTPUT_SESSION_EFFECTS: {
-                    ReleaseOutputSessionEffectsData *data =
-                            (ReleaseOutputSessionEffectsData *)command->mParam.get();
-                    ALOGV("AudioCommandThread() processing release output session effects %d %d %d",
-                            data->mOutput, data->mStream, data->mSessionId);
-                    svc = mService.promote();
-                    if (svc == 0) {
-                        break;
-                    }
-                    mLock.unlock();
-                    svc->mAudioPolicyEffects->doReleaseOutputSessionEffects(
-                            data->mOutput, data->mStream, data->mSessionId);
-                    mLock.lock();
-                    } break;
-                case ADD_OUTPUT_SESSION_EFFECTS: {
-                    AddOutputSessionEffectsData *data = (AddOutputSessionEffectsData *)command->mParam.get();
-                    ALOGV("AudioCommandThread() processing add output session effects %d",
-                            data->mOutput);
-                    svc = mService.promote();
-                    if (svc == 0) {
-                        break;
-                    }
-                    mLock.unlock();
-                    svc->mAudioPolicyEffects->doAddOutputSessionEffects(
-                            data->mOutput, data->mStream, data->mSessionId,
-                            data->mFlags, data->mChannelMask, data->mUid);
-                    mLock.lock();
-                    }break;
-
 
                 default:
                     ALOGW("AudioCommandThread() unknown command %d", command->mCommand);
@@ -852,29 +816,6 @@ status_t AudioPolicyService::AudioCommandThread::startOutputCommand(audio_io_han
     return sendCommand(command);
 }
 
-status_t AudioPolicyService::AudioCommandThread::addOutputSessionEffectsCommand(audio_io_handle_t output,
-                                                                    audio_stream_type_t stream,
-                                                                    audio_session_t session,
-                                                                    audio_output_flags_t flags,
-                                                                    audio_channel_mask_t channelMask,
-                                                                    uid_t uid)
-{
-    sp<AudioCommand> command = new AudioCommand();
-    command->mCommand = ADD_OUTPUT_SESSION_EFFECTS;
-    sp<AddOutputSessionEffectsData> data = new AddOutputSessionEffectsData();
-    data->mOutput = output;
-    data->mStream = stream;
-    data->mSessionId = session;
-    data->mFlags = flags;
-    data->mChannelMask = channelMask;
-    data->mUid = uid;
-    command->mParam = data;
-    command->mWaitStatus = false;
-    ALOGV("AudioCommandThread() adding start output %d", output);
-    return sendCommand(command);
-}
-
-
 void AudioPolicyService::AudioCommandThread::stopOutputCommand(audio_io_handle_t output,
                                                                audio_stream_type_t stream,
                                                                audio_session_t session)
@@ -1003,23 +944,6 @@ void AudioPolicyService::AudioCommandThread::effectSessionUpdateCommand(
     sendCommand(command);
 }
 
-void AudioPolicyService::AudioCommandThread::releaseOutputSessionEffectsCommand(
-        audio_io_handle_t output, audio_stream_type_t stream,
-        audio_unique_id_t sessionId, int delayMs)
-{
-    sp<AudioCommand> command = new AudioCommand();
-    command->mCommand = RELEASE_OUTPUT_SESSION_EFFECTS;
-    ReleaseOutputSessionEffectsData *data = new ReleaseOutputSessionEffectsData();
-    data->mOutput = output;
-    data->mStream = stream;
-    data->mSessionId = sessionId;
-    command->mParam = data;
-    ALOGV("AudioCommandThread() sending release output session effects (id=%d) for stream %d",
-            sessionId, stream);
-    sendCommand(command, delayMs);
-}
-
-
 status_t AudioPolicyService::AudioCommandThread::sendCommand(sp<AudioCommand>& command, int delayMs)
 {
     {
-- 
cgit v1.1