summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-09-17 23:25:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-17 23:25:37 -0700
commitd44b51d9fcb0b5d891d2abece83a551e71ebb73b (patch)
tree231b23f58a891c0c1db02e1982d9a21a6e302eda /media/libmedia/mediaplayer.cpp
parent979d233237271c2acc0c3902508e208fce16a1c9 (diff)
parent6901625dcb847871e23f04b9a282dc5d313a1d57 (diff)
downloadframeworks_av-d44b51d9fcb0b5d891d2abece83a551e71ebb73b.zip
frameworks_av-d44b51d9fcb0b5d891d2abece83a551e71ebb73b.tar.gz
frameworks_av-d44b51d9fcb0b5d891d2abece83a551e71ebb73b.tar.bz2
am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c' * commit '5c9f35799422d818f34f814c76c2acd8c939a40c': Add a check to track a problem the monkey script has been triggering.
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
-rw-r--r--media/libmedia/mediaplayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 32b20c7..da1f7e5 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -595,6 +595,9 @@ void MediaPlayer::notify(int msg, int ext1, int ext2)
break;
case MEDIA_PLAYBACK_COMPLETE:
LOGV("playback complete");
+ if (mCurrentState == MEDIA_PLAYER_IDLE) {
+ LOGE("playback complete in idle state");
+ }
if (!mLoop) {
mCurrentState = MEDIA_PLAYER_PLAYBACK_COMPLETE;
}