commit 8456ddd1e4c3daa8f32ea1cbb94c70275e5a22f5
author Wei Jia <wjia@google.com> Fri Apr 22 14:46:43 2016 -0700
committer Wei Jia <wjia@google.com> Fri Apr 22 15:18:37 2016 -0700
tree 0b936976fc02bd6e96be2645c3395a0922b3db44
parent 122f45dbfeef9672231bb94eabb7f223d4b0241e

NuPlayer: ignore stale message for teardown.

Bug: 28121584
Change-Id: I9df088b4d99ebae38c06a1138f3d66b31bf67529

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 42a82ac..8f7ca1f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1144,6 +1144,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;