commit 83ff1438d2d1d5dbf39ca5e6f2e4fa1799e7ba80
author Marco Nelissen <marcone@google.com> Wed Mar 10 10:53:16 2010 -0800
committer Marco Nelissen <marcone@google.com> Wed Mar 10 10:55:09 2010 -0800
tree 4f1398095d0a69f4aa46cf533137c51ada1599fa
parent b699c595d78e8cd7f60c2c5102d40db07b18926b

MEDIA_PLAYER_STATE_ERROR is not a bitmask
(b/2502881)

Change-Id: I08e427eb2c36f5d70e40f9aeb8638fa8262de989

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index d2cec0c..f623295 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -104,7 +104,8 @@
     { // 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;
         }