commit ce805c2a0c447dcdd4e649db7415020dbec1100b
author Glenn Kasten <gkasten@google.com> Wed Oct 14 00:24:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 00:24:47 2015 +0000
tree dc1483abc741f722bb8b26328542b3376c7f34f9
parent cfda8c4370515bcdfc688b1522f32ff59ba8abfd
parent a5b4642220b810d8f044171c7c05aed0597a1812

Merge "NuPlayerRenderer: do not send rendering started message when paused" into mnc-dr-dev

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index ab3d66a..d17f7ae 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,