commit cd05b9a27a35fcf840de2554bd35f279bddf597d
author Wei Jia <wjia@google.com> Sat Aug 06 00:34:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 06 00:34:05 2016 +0000
tree 32b52c8f62ca1bf0969cd64e083771b6d95fdc15
parent bb8526358b9bf09ffc79b8f54dd57140df4fb2d6
parent adee56abc3749b18f90e7788990a0b5ae1bf430e

Merge "MediaPlayerService: clear output in CallbackData when recycling AudioTrack." into nyc-mr1-dev

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()) {