diff options
| author | Marco Nelissen <marcone@google.com> | 2013-05-11 00:35:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-11 00:35:30 +0000 |
| commit | 0d24eb5e89963663150d38a320ec17244d39edf2 (patch) | |
| tree | 871121aa7d94d29d25f28ab10d4aa69cc78f9014 /media | |
| parent | 519f7624696cf43a7fafe21fd2108deaad0bfe4a (diff) | |
| parent | 082aa3f335ffeedacafeb8982684cbb371a18c32 (diff) | |
| download | frameworks_av-0d24eb5e89963663150d38a320ec17244d39edf2.zip frameworks_av-0d24eb5e89963663150d38a320ec17244d39edf2.tar.gz frameworks_av-0d24eb5e89963663150d38a320ec17244d39edf2.tar.bz2 | |
Merge "Don't purge effects we're about to start using" into jb-mr2-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index ecae3d3..4a34233 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -575,8 +575,8 @@ status_t MediaPlayer::setAudioSessionId(int sessionId) return BAD_VALUE; } if (sessionId != mAudioSessionId) { - AudioSystem::releaseAudioSessionId(mAudioSessionId); AudioSystem::acquireAudioSessionId(sessionId); + AudioSystem::releaseAudioSessionId(mAudioSessionId); mAudioSessionId = sessionId; } return NO_ERROR; |