MEDIA_PLAYER_STATE_ERROR is not a bitmask

(b/2502881) Change-Id: I08e427eb2c36f5d70e40f9aeb8638fa8262de989
2010-03-10 10:53:16 -08:00
parent a8fbe1fb74
commit e44b41bada
1 changed files with 2 additions and 1 deletions
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -104,7 +104,8 @@ status_t MediaPlayer::setDataSource(const sp<IMediaPlayer>& player)
    { // scope for the lock
        Mutex::Autolock _l(mLock);

-        if ( !( mCurrentState & ( MEDIA_PLAYER_IDLE | MEDIA_PLAYER_STATE_ERROR ) ) ) {
+        if ( !( (mCurrentState & MEDIA_PLAYER_IDLE) ||
+                (mCurrentState == MEDIA_PLAYER_STATE_ERROR ) ) ) {
            LOGE("setDataSource called in state %d", mCurrentState);
            return INVALID_OPERATION;
        }