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

4 files changed, 0 insertions, 20 deletions

diff --git a/include/media/AudioPolicy.h b/include/media/AudioPolicy.h
index 5a82bae..feed402 100644
--- a/include/media/AudioPolicy.h
+++ b/include/media/AudioPolicy.h
@@ -42,7 +42,6 @@ namespace android {
 //   AudioSystem's implementation of the AudioPolicyClient interface
 // keep in sync with AudioSystem.java
 #define DYNAMIC_POLICY_EVENT_MIX_STATE_UPDATE 0
-#define AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE 10
 
 #define MIX_STATE_DISABLED -1
 #define MIX_STATE_IDLE 0
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index be1d114..26a0bb2 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -31,10 +31,6 @@ namespace android {
 
 typedef void (*audio_error_callback)(status_t err);
 typedef void (*dynamic_policy_callback)(int event, String8 regId, int val);
-typedef void (*effect_session_callback)(int event,
-        audio_stream_type_t stream, audio_unique_id_t sessionId,
-        audio_output_flags_t flags, audio_channel_mask_t channelMask,
-        uid_t uid, bool added);
 
 class IAudioFlinger;
 class IAudioPolicyService;
@@ -96,7 +92,6 @@ public:
 
     static void setErrorCallback(audio_error_callback cb);
     static void setDynPolicyCallback(dynamic_policy_callback cb);
-    static status_t setEffectSessionCallback(effect_session_callback cb);
 
     // helper function to obtain AudioFlinger service handle
     static const sp<IAudioFlinger> get_audio_flinger();
@@ -424,11 +419,6 @@ private:
         virtual void onAudioPortListUpdate();
         virtual void onAudioPatchListUpdate();
         virtual void onDynamicPolicyMixStateUpdate(String8 regId, int32_t state);
-        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:
         Mutex                               mLock;
@@ -448,7 +438,6 @@ private:
     static sp<IAudioFlinger> gAudioFlinger;
     static audio_error_callback gAudioErrorCallback;
     static dynamic_policy_callback gDynPolicyCallback;
-    static effect_session_callback gEffectSessionCallback;
 
     static size_t gInBuffSize;
     // previous parameters for recording buffer size queries
diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h
index 3a7bd68..6b93f6f 100644
--- a/include/media/IAudioPolicyService.h
+++ b/include/media/IAudioPolicyService.h
@@ -165,8 +165,6 @@ public:
                                       const audio_attributes_t *attributes,
                                       audio_io_handle_t *handle) = 0;
     virtual status_t stopAudioSource(audio_io_handle_t handle) = 0;
-
-    virtual status_t setEffectSessionCallbacksEnabled(bool enabled) = 0;
 };
 
 
diff --git a/include/media/IAudioPolicyServiceClient.h b/include/media/IAudioPolicyServiceClient.h
index 18aed8d..a7f2cc3 100644
--- a/include/media/IAudioPolicyServiceClient.h
+++ b/include/media/IAudioPolicyServiceClient.h
@@ -37,12 +37,6 @@ public:
     virtual void onAudioPatchListUpdate() = 0;
     // Notifies a change in the mixing state of a specific mix in a dynamic audio policy
     virtual void onDynamicPolicyMixStateUpdate(String8 regId, int32_t state) = 0;
-    // Notifies when a default effect set is attached to a session/stream
-    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) = 0;
 };