diff options
| author | Marco Nelissen <marcone@google.com> | 2013-05-10 17:39:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-10 17:39:38 -0700 |
| commit | 1ba7c0abc004333be7768df03553b6ffaa242d0a (patch) | |
| tree | 6db18c32793e4903eca9d06b646872867fcd1e6c /media | |
| parent | d7107bf350e6e7720ab412396891348b092f330b (diff) | |
| parent | 780dbd3357511770d655e55f69036d63c90089a9 (diff) | |
| download | frameworks_av-1ba7c0abc004333be7768df03553b6ffaa242d0a.zip frameworks_av-1ba7c0abc004333be7768df03553b6ffaa242d0a.tar.gz frameworks_av-1ba7c0abc004333be7768df03553b6ffaa242d0a.tar.bz2 | |
am 780dbd33: am 0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev
* commit '780dbd3357511770d655e55f69036d63c90089a9':
Don't purge effects we're about to start using
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; |