Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbdaa08c authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "propogate heartbeat error code to app" into lmp-dev

parents 306c92da f4c0a94a

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -901,7 +901,11 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                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 {