Revert "Restore old signature for acquire/release session"

This reverts commit 2d51b7c18ad0ffd142d7ba94203f52ba3f735530.

Change-Id: I8e17813b9639d8e928bcfa348d21c45fb8b5f846
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.
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();