commit 6376cd5767f85e7f094dbee387c2c345c1e2e664
author Wei Jia <wjia@google.com> Wed Sep 26 11:42:55 2018 -0700
committer Wei Jia <wjia@google.com> Wed Sep 26 11:42:55 2018 -0700
tree c33eb2f7cc9ac15cae55f0fcab9963582c4f7b32
parent f0941797537ee31027e6c6e9600eb3fd939b7ea8

MediaPlayer2: allow prepared->pause

Test: cts
Bug: 112549021
Change-Id: I3ead79f5c2441c01b80483e454d34e559129727e

media/libmediaplayer2/mediaplayer2.cpp

diff --git a/media/libmediaplayer2/mediaplayer2.cpp b/media/libmediaplayer2/mediaplayer2.cpp
index bafd32c..d9c9826 100644
--- a/media/libmediaplayer2/mediaplayer2.cpp
+++ b/media/libmediaplayer2/mediaplayer2.cpp
@@ -660,7 +660,7 @@
     Mutex::Autolock _l(mLock);
     if (mCurrentState & (MEDIA_PLAYER2_PAUSED|MEDIA_PLAYER2_PLAYBACK_COMPLETE))
         return NO_ERROR;
-    if ((mPlayer != 0) && (mCurrentState & MEDIA_PLAYER2_STARTED)) {
+    if ((mPlayer != 0) && (mCurrentState & (MEDIA_PLAYER2_STARTED | MEDIA_PLAYER2_PREPARED))) {
         status_t ret = mPlayer->pause();
         if (ret != NO_ERROR) {
             mCurrentState = MEDIA_PLAYER2_STATE_ERROR;