commit e743d2ece72a0a7843cb17d2e04c9faaa3570884
author Marco Nelissen <marcone@google.com> Sat May 11 00:35:30 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 11 00:35:30 2013 +0000
tree 871121aa7d94d29d25f28ab10d4aa69cc78f9014
parent 033988dc8772d950ed6926352abae6a700e48774
parent 8bdb01c279828e286a6e8b22ff0c1bcb6aa6ee8f

Merge "Don't purge effects we're about to start using" into jb-mr2-dev

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;