summaryrefslogtreecommitdiffstats
path: root/media
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
commitca216a03f5301dd7d28a31529ae44d4974255b37 (patch)
treec08e3d6ac618e664cfefaa1319fe00405fa7dc7e /media
parent03f3cb083d708d4d3226b80ed42c9d2876a56edc (diff)
parent5c9f35799422d818f34f814c76c2acd8c939a40c (diff)
downloadframeworks_base-ca216a03f5301dd7d28a31529ae44d4974255b37.zip
frameworks_base-ca216a03f5301dd7d28a31529ae44d4974255b37.tar.gz
frameworks_base-ca216a03f5301dd7d28a31529ae44d4974255b37.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')
-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;
}