commit 5f3194c9efeadc200c89d9e2b00a19f1afeac55d
author Wei Jia <wjia@google.com> Tue Jan 13 17:46:31 2015 -0800
committer Rachad Alao <rachad@google.com> Wed Jan 14 02:29:02 2015 +0000
tree f44ee33ce39b186c42d34183109ab2690a4342c1
parent 0b460ad7557f6be56aad3fa027d93b38d5995ac4

MidiFile: report correct state during transient period when start() is called first time.

Bug: 18905421
Bug: 18994222
Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22

media/libmediaplayerservice/MidiFile.cpp

diff --git a/media/libmediaplayerservice/MidiFile.cpp b/media/libmediaplayerservice/MidiFile.cpp
index 749ef96..60cbd3c 100644
--- a/media/libmediaplayerservice/MidiFile.cpp
+++ b/media/libmediaplayerservice/MidiFile.cpp
@@ -293,7 +293,7 @@
 {
     ALOGV("MidiFile::isPlaying, mState=%d", int(mState));
     if (!mEasHandle || mPaused) return false;
-    return (mState == EAS_STATE_PLAY);
+    return (mState == EAS_STATE_PLAY || (mState == EAS_STATE_READY && mRender));
 }
 
 status_t MidiFile::getCurrentPosition(int* position)