From c625796ad78ade1f9c5235d482d20f74c8c05f81 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 28 Jan 2015 09:15:17 -0800 Subject: libmedia: Fix mismatched state * Seen during flaky network test Change-Id: I491529d6164e2312242c659bb3ca051e60da3612 --- media/libmedia/mediaplayer.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'media/libmedia/mediaplayer.cpp') diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 502ab2d..6c0606c 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -395,6 +395,10 @@ bool MediaPlayer::isPlaying() ALOGE("internal/external state mismatch corrected"); mCurrentState = MEDIA_PLAYER_STARTED; } + if ((mCurrentState & MEDIA_PLAYER_PLAYBACK_COMPLETE) && temp) { + ALOGE("internal/external state mismatch corrected"); + mCurrentState = MEDIA_PLAYER_STARTED; + } return temp; } ALOGV("isPlaying: no active player"); -- cgit v1.1