summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioSystem.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-02-13 22:44:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-13 22:44:30 +0000
commitc940c38242e8e0265db25a646ad63263934f2bb9 (patch)
tree6da7629ff9195d916a7ee7974dced87e830bce51 /media/libmedia/AudioSystem.cpp
parent240abcc4bf661a10ffca24859945796acc76ac6e (diff)
parentd457c970c8d08519cd77280a90b61ae1e342cfe3 (diff)
downloadframeworks_av-c940c38242e8e0265db25a646ad63263934f2bb9.zip
frameworks_av-c940c38242e8e0265db25a646ad63263934f2bb9.tar.gz
frameworks_av-c940c38242e8e0265db25a646ad63263934f2bb9.tar.bz2
Merge "Track pid for each session"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r--media/libmedia/AudioSystem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index 87f4b4c..140fb66 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -435,19 +435,19 @@ int AudioSystem::newAudioSessionId()
return af->newAudioSessionId();
}
-void AudioSystem::acquireAudioSessionId(int audioSession)
+void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid)
{
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
- af->acquireAudioSessionId(audioSession);
+ af->acquireAudioSessionId(audioSession, pid);
}
}
-void AudioSystem::releaseAudioSessionId(int audioSession)
+void AudioSystem::releaseAudioSessionId(int audioSession, pid_t pid)
{
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
- af->releaseAudioSessionId(audioSession);
+ af->releaseAudioSessionId(audioSession, pid);
}
}