commit 85dbe661a2989d1c51182b62701e412104fbfffc
author Wei Jia <wjia@google.com> Sat Aug 06 01:25:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 06 01:25:14 2016 +0000
tree 32b52c8f62ca1bf0969cd64e083771b6d95fdc15
parent cdb35bb0c0c3253440a5dffdc1b1e96ff50f5588
parent adee56abc3749b18f90e7788990a0b5ae1bf430e

MediaPlayerService: clear output in CallbackData when recycling AudioTrack.
am: adee56abc3

Change-Id: I72d4b7dc2b824f14bad62965bfa91b789756701f

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index d790821..3cfed5e 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1938,6 +1938,7 @@
                     continue;
                 }
                 callbackData->mSwitching = true; // begin track switch
+                callbackData->setOutput(NULL);
 #else
                 // tryBeginTrackSwitch() returns false if the callback has the lock.
                 if (!mCallbackData->tryBeginTrackSwitch()) {