commit 8986b4d50c8d46de2a8950cb23fcc4138df67191
author Wei Jia <wjia@google.com> Sat Apr 23 00:06:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 23 00:06:31 2016 +0000
tree 5f057950b53689f2508d47802d087aab7ec65da7
parent bfb69e61f16ccb011926dbefa90725fb73243c7f
parent 8456ddd1e4c3daa8f32ea1cbb94c70275e5a22f5

Merge "NuPlayer: ignore stale message for teardown." into nyc-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 7b000fa..46a51ce 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1151,6 +1151,11 @@
                 int32_t reason;
                 CHECK(msg->findInt32("reason", &reason));
                 ALOGV("Tear down audio with reason %d.", reason);
+                if (reason == Renderer::kDueToTimeout && !(mPaused && mOffloadAudio)) {
+                    // TimeoutWhenPaused is only for offload mode.
+                    ALOGW("Receive a stale message for teardown.");
+                    break;
+                }
                 int64_t positionUs;
                 if (!msg->findInt64("positionUs", &positionUs)) {
                     positionUs = mPreviousSeekTimeUs;