commit 5af6a9b4a6924377d80de7c3f460f99b89cff91e
author Wei Jia <wjia@google.com> Thu Jun 16 12:07:26 2016 -0700
committer Wei Jia <wjia@google.com> Thu Jun 16 19:32:16 2016 +0000
tree 78b78152a8f8ecf03397bb14f4f6d6a02255f9b9
parent 2dd124980b4d90daae60127eec56a88bda7e417b

MediaPlayer: disallow calling setPlaybackParams in stopped state.

Bug: 29420829
Change-Id: Iaba71f3b975022f150962fa306c2426c61457820

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 8725dfe..fbe749c 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -395,7 +395,9 @@
         return BAD_VALUE;
     }
     Mutex::Autolock _l(mLock);
-    if (mPlayer == 0) return INVALID_OPERATION;
+    if (mPlayer == 0 || (mCurrentState & MEDIA_PLAYER_STOPPED)) {
+        return INVALID_OPERATION;
+    }
 
     if (rate.mSpeed != 0.f && !(mCurrentState & MEDIA_PLAYER_STARTED)
             && (mCurrentState & (MEDIA_PLAYER_PREPARED | MEDIA_PLAYER_PAUSED