Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/2502881)"

Browse Source
This commit is contained in:
Marco Nelissen
2010-03-10 10:58:23 -08:00
committed by Android (Google) Code Review
parent 9ceaf70eab e44b41bada
commit 8da2650df8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libmedia/mediaplayer.cpp
View File

@@ -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;
}