frameworks/base: Fix for force close during rapid FF of cetain midi clips

-Rapid fast forward of certain midi clips result in force close
message and music app exits.
-setDataSource and prepare fail in playback complete state of
media player
-Return error when setDataSource and prepare are called in playback
complete state.

Change-Id: Ie7cf80a36400db833b6e6d7c162f8a8f8eee2e5e
CRs-Fixed: 260087

1 files changed, 6 insertions, 0 deletions

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 0bf35ce..ba21524 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -106,6 +106,9 @@ status_t MediaPlayer::setDataSource(const sp<IMediaPlayer>& player)
     { // scope for the lock
         Mutex::Autolock _l(mLock);
 
+        if (mCurrentState & MEDIA_PLAYER_PLAYBACK_COMPLETE)
+            return UNKNOWN_ERROR;
+
         if ( !( (mCurrentState & MEDIA_PLAYER_IDLE) ||
                 (mCurrentState == MEDIA_PLAYER_STATE_ERROR ) ) ) {
             LOGE("setDataSource called in state %d", mCurrentState);
@@ -216,6 +219,9 @@ status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface)
 // must call with lock held
 status_t MediaPlayer::prepareAsync_l()
 {
+    if (mCurrentState & MEDIA_PLAYER_PLAYBACK_COMPLETE)
+        return UNKNOWN_ERROR;
+
     if ( (mPlayer != 0) && ( mCurrentState & ( MEDIA_PLAYER_INITIALIZED | MEDIA_PLAYER_STOPPED) ) ) {
         mPlayer->setAudioStreamType(mStreamType);
         mCurrentState = MEDIA_PLAYER_PREPARING;