From 39312b1c0cc17db8c485a072c4e3b2c001c207d2 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 23 Apr 2016 00:50:06 -0700
Subject: media: Remove effect session callbacks from the framework

 * This API is moving to CMSDK.

Revert "media: Add flags, channelMask, and UID to audio session callbacks"

This reverts commit e0554d493e870ea5e323ed06f54becb93c19fa04.

Revert "audiosystem: Add API for listening to effect session events"

This reverts commit 9957394df71db6f01802091858216582c58eab67.

Change-Id: I5f18fdb3390db25285a5b819dfe2136ae111c0b3
---
 media/java/android/media/AudioSystem.java | 51 -------------------------------
 1 file changed, 51 deletions(-)

(limited to 'media')

diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index dca509b..927cd87 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -268,55 +268,6 @@ public class AudioSystem
     }
 
 
-   /**
-     * Handles events for the audio policy manager about effect sessions
-     * @see android.media.audiopolicy.AudioPolicy
-     */
-    public interface EffectSessionCallback
-    {
-        void onSessionAdded(int stream, int sessionId, int flags, int channelMask, int uid);
-
-        void onSessionRemoved(int stream, int sessionId);
-    }
-
-    //keep in sync with include/media/AudioPolicy.h
-    private final static int AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE = 10;
-
-    private static EffectSessionCallback sEffectSessionCallback;
-
-    public static void setEffectSessionCallback(EffectSessionCallback cb)
-    {
-        synchronized (AudioSystem.class) {
-            sEffectSessionCallback = cb;
-            native_register_effect_session_callback();
-        }
-    }
-
-    private static void effectSessionCallbackFromNative(int event, int stream, int sessionId,
-            int flags, int channelMask, int uid, boolean added)
-    {
-        EffectSessionCallback cb = null;
-        synchronized (AudioSystem.class) {
-            if (sEffectSessionCallback != null) {
-                cb = sEffectSessionCallback;
-            }
-        }
-        if (cb != null) {
-            switch(event) {
-                case AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE:
-                    if (added) {
-                        cb.onSessionAdded(stream, sessionId, flags, channelMask, uid);
-                    } else {
-                        cb.onSessionRemoved(stream, sessionId);
-                    }
-                    break;
-                default:
-                    Log.e(TAG, "effectSessionCallbackFromNative: unknown event " + event);
-            }
-        }
-    }
-
-
     /*
      * Error codes used by public APIs (AudioTrack, AudioRecord, AudioManager ...)
      * Must be kept in sync with frameworks/base/core/jni/android_media_AudioErrors.h
@@ -697,8 +648,6 @@ public class AudioSystem
     // declare this instance as having a dynamic policy callback handler
     private static native final void native_register_dynamic_policy_callback();
 
-    private static native final void native_register_effect_session_callback();
-
     // must be kept in sync with value in include/system/audio.h
     public static final int AUDIO_HW_SYNC_INVALID = 0;
 
-- 
cgit v1.1