commit c67c65882f7cf1d3ae617bff41ff9c7ec8a0fd27
author Glenn Kasten <gkasten@google.com> Wed Oct 14 01:24:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 14 01:24:25 2015 +0000
tree 68e91ad1c34d514bea75a537794c1210685d8b32
parent f8b1280535a6e3ebcf864d434a01d6c672cadd9a
parent 5116febf966875c19a0b137a3deef0ba0ebe42df

am 5116febf: am cfda8c43: Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into mnc-dr-dev

* commit '5116febf966875c19a0b137a3deef0ba0ebe42df':
  AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 40b94b8..81c2942 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1852,7 +1852,11 @@
         case NO_ERROR:
         case DEAD_OBJECT:
         case TIMED_OUT:
-            mCbf(EVENT_STREAM_END, mUserData, NULL);
+            if (status != DEAD_OBJECT) {
+                // for DEAD_OBJECT, we do not send a EVENT_STREAM_END after stop();
+                // instead, the application should handle the EVENT_NEW_IAUDIOTRACK.
+                mCbf(EVENT_STREAM_END, mUserData, NULL);
+            }
             {
                 AutoMutex lock(mLock);
                 // The previously assigned value of waitStreamEnd is no longer valid,