commit 6e70614750e8100f86fb4cb0f010b49aef39b3a1
author Glenn Kasten <gkasten@google.com> Thu Jun 23 18:39:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 23 18:39:32 2016 +0000
tree 6e80d1039323547988dc955d6acfed9bdc4b8d67
parent ef9cab1d86054d8ab17056990e0264e1ccb826c1
parent fc5c22b0c574f97fbf5c87f9a01b4d60e27e6b37

Merge "Revert "Restore old signature for acquire/release session"" into nyc-dev

include/media/AudioSystem.h

diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index 2e658fc..2e6646a 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -160,10 +160,6 @@
     static void acquireAudioSessionId(audio_session_t audioSession, pid_t pid);
     static void releaseAudioSessionId(audio_session_t audioSession, pid_t pid);
 
-    // FIXME remove
-    static void acquireAudioSessionId(int audioSession, pid_t pid);
-    static void releaseAudioSessionId(int audioSession, pid_t pid);
-
     // Get the HW synchronization source used for an audio session.
     // Return a valid source or AUDIO_HW_SYNC_INVALID if an error occurs
     // or no HW sync source is used.

media/libmedia/AudioSystem.cpp

diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index fcc266a..808b3ab 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -417,18 +417,6 @@
     }
 }
 
-// FIXME remove
-void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid)
-{
-    acquireAudioSessionId((audio_session_t) audioSession, pid);
-}
-
-// FIXME remove
-void AudioSystem::releaseAudioSessionId(int audioSession, pid_t pid)
-{
-    releaseAudioSessionId((audio_session_t) audioSession, pid);
-}
-
 audio_hw_sync_t AudioSystem::getAudioHwSyncForSession(audio_session_t sessionId)
 {
     const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();