summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-09-17 15:42:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-17 15:42:21 -0700
commit6901625dcb847871e23f04b9a282dc5d313a1d57 (patch)
treef38ba0c376ffef125ceb126c8223b5ba20153986 /media/libmedia
parentab1b9612fc5ad9d98ff76b3eb18d9f48a295f13e (diff)
parent1c1503cf47c0a37a30e7acac2c5d29140fc61a5f (diff)
downloadframeworks_av-6901625dcb847871e23f04b9a282dc5d313a1d57.zip
frameworks_av-6901625dcb847871e23f04b9a282dc5d313a1d57.tar.gz
frameworks_av-6901625dcb847871e23f04b9a282dc5d313a1d57.tar.bz2
am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp * commit 'f30fae63389a2216faf55636b95a08f35b5c3620': Add a check to track a problem the monkey script has been triggering.
Diffstat (limited to 'media/libmedia')
-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 f3229c0..c6b2efb 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -590,6 +590,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;
}