commit d976c1c0675144b35f5bf9c7e3371c5e8aa75124
author Wei Jia <wjia@google.com> Fri Jun 17 23:51:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 17 23:51:04 2016 +0000
tree 2d9a653ab11cecec985680665b3c911049968c4d
parent 6d813c2cac0714b34764fcddbd93771a0fefa829
parent 4dead6f3c81a8f21b71c7baedfe9cb73e112e167

Merge \\"MediaPlayer: disallow calling setPlaybackParams in stopped state.\\" into nyc-mr1-dev am: 9ec10a72bf
am: 4dead6f3c8

Change-Id: I357634d2ef1013c38b2b26d779002692159d8d63

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