commit 1ba7c0abc004333be7768df03553b6ffaa242d0a
author Marco Nelissen <marcone@google.com> Fri May 10 17:39:38 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 10 17:39:38 2013 -0700
tree 6db18c32793e4903eca9d06b646872867fcd1e6c
parent d7107bf350e6e7720ab412396891348b092f330b
parent 780dbd3357511770d655e55f69036d63c90089a9

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

media/libmedia/mediaplayer.cpp

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 @@
         return BAD_VALUE;
     }
     if (sessionId != mAudioSessionId) {
-        AudioSystem::releaseAudioSessionId(mAudioSessionId);
         AudioSystem::acquireAudioSessionId(sessionId);
+        AudioSystem::releaseAudioSessionId(mAudioSessionId);
         mAudioSessionId = sessionId;
     }
     return NO_ERROR;