audiopolicy: Revert all session callback patches.

 * This has been rearchitected in a better way, as this
   feature turns out to be more difficult than it seems.
 * Reverting all of this stuff and rolling it into a single commit.

This reverts commit c27a16c33c78a36482336a16199b1b8be794cea4.
This reverts commit 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31.
This reverts commit 489c9fb62f02e1d23d6d6c89b22f7d19c596e65e.
This reverts commit a4123803d0a0e9e0c69faa4207d357cc74a65d58.
This reverts commit e13b58b988ab642d4ae5ca6d0a89013510714956.
This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9.
This reverts commit 0479d7c79a7fd6f112e8dc7e45c009cf6602dbaa.

Change-Id: Iaed9f198d806aa414c95960713e8187c98db248b

1 files changed, 2 insertions, 43 deletions

diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index bc2875d..d11294b 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -202,8 +202,6 @@ public:
                                       audio_io_handle_t *handle);
     virtual status_t stopAudioSource(audio_io_handle_t handle);
 
-    virtual status_t setEffectSessionCallbacksEnabled(bool enabled);
-
             status_t doStartOutput(audio_io_handle_t output,
                                    audio_stream_type_t stream,
                                    audio_session_t session);
@@ -231,17 +229,6 @@ public:
             void onDynamicPolicyMixStateUpdate(String8 regId, int32_t state);
             void doOnDynamicPolicyMixStateUpdate(String8 regId, int32_t state);
 
-            void 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);
-            void 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);
-
 private:
                         AudioPolicyService() ANDROID_API;
     virtual             ~AudioPolicyService();
@@ -273,8 +260,7 @@ private:
             UPDATE_AUDIOPORT_LIST,
             UPDATE_AUDIOPATCH_LIST,
             SET_AUDIOPORT_CONFIG,
-            DYN_POLICY_MIX_STATE_UPDATE,
-            EFFECT_SESSION_UPDATE,
+            DYN_POLICY_MIX_STATE_UPDATE
         };
 
         AudioCommandThread (String8 name, const wp<AudioPolicyService>& service);
@@ -317,11 +303,6 @@ private:
                                                           int delayMs);
                     void        dynamicPolicyMixStateUpdateCommand(String8 regId, int32_t state);
                     void        insertCommand_l(AudioCommand *command, int delayMs = 0);
-                    void        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);
 
     private:
         class AudioCommandData;
@@ -418,16 +399,6 @@ private:
             int32_t mState;
         };
 
-        class EffectSessionUpdateData : public AudioCommandData {
-        public:
-            audio_stream_type_t mStream;
-            audio_session_t mSessionId;
-            audio_output_flags_t mFlags;
-            audio_channel_mask_t mChannelMask;
-            uid_t mUid;
-            bool mAdded;
-        };
-
         Mutex   mLock;
         Condition mWaitWorkCV;
         Vector < sp<AudioCommand> > mAudioCommands; // list of pending commands
@@ -537,12 +508,6 @@ private:
 
         virtual audio_unique_id_t newAudioUniqueId();
 
-        virtual void 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);
-
      private:
         AudioPolicyService *mAudioPolicyService;
     };
@@ -559,12 +524,7 @@ private:
                             void      onAudioPatchListUpdate();
                             void      onDynamicPolicyMixStateUpdate(String8 regId, int32_t state);
                             void      setAudioPortCallbacksEnabled(bool enabled);
-                            void      setEffectSessionCallbacksEnabled(bool enabled);
-                            void      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);
+
                 // IBinder::DeathRecipient
                 virtual     void        binderDied(const wp<IBinder>& who);
 
@@ -576,7 +536,6 @@ private:
         const uid_t                         mUid;
         const sp<IAudioPolicyServiceClient> mAudioPolicyServiceClient;
               bool                          mAudioPortCallbacksEnabled;
-              bool                          mEffectSessionCallbacksEnabled;
     };
 
     // Internal dump utilities.