commit adee56abc3749b18f90e7788990a0b5ae1bf430e
author Wei Jia <wjia@google.com> Fri Aug 05 15:40:34 2016 -0700
committer Wei Jia <wjia@google.com> Fri Aug 05 15:40:34 2016 -0700
tree 98a630421dbcf4c8f27b810666ba03f2437f4310
parent e7449bf60c861f1dea7510f706004dfdb5efb2a7

MediaPlayerService: clear output in CallbackData when recycling AudioTrack.

Bug: 30365636
Change-Id: I3832a309f78a6fa89d4afea7bdd7139f0d9013f4

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