commit f4c0a94ab32541611f5ed6d407fc25b394c1988b
author Chong Zhang <chz@google.com> Mon Aug 11 15:14:10 2014 -0700
committer Chong Zhang <chz@google.com> Mon Aug 11 16:31:15 2014 -0700
tree 345e7e7179fa38707c2c82926b14a16ed8f6f4f4
parent ced1c2f8f6c422063092f5cc5c675ccdebb2dc10

propogate heartbeat error code to app

Bug: 16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 6f6c9d9..4889dbc 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -876,7 +876,11 @@
                 ALOGE("Received error from %s decoder, aborting playback.",
                      audio ? "audio" : "video");
 
-                mRenderer->queueEOS(audio, UNKNOWN_ERROR);
+                status_t err;
+                if (!msg->findInt32("err", &err)) {
+                    err = UNKNOWN_ERROR;
+                }
+                mRenderer->queueEOS(audio, err);
             } else if (what == Decoder::kWhatDrainThisBuffer) {
                 renderBuffer(audio, msg);
             } else {