summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-01-28 09:15:17 -0800
committerSteve Kondik <steve@cyngn.com>2015-10-23 12:38:46 -0500
commitc625796ad78ade1f9c5235d482d20f74c8c05f81 (patch)
treebd235b8855bade9f1be7bbf950b58025b2a60fe7 /media/libmedia/mediaplayer.cpp
parent4b8a5ccef9217c22ffabc449f7f0a920941e88b0 (diff)
downloadframeworks_av-c625796ad78ade1f9c5235d482d20f74c8c05f81.zip
frameworks_av-c625796ad78ade1f9c5235d482d20f74c8c05f81.tar.gz
frameworks_av-c625796ad78ade1f9c5235d482d20f74c8c05f81.tar.bz2
libmedia: Fix mismatched state
* Seen during flaky network test Change-Id: I491529d6164e2312242c659bb3ca051e60da3612
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
-rw-r--r--media/libmedia/mediaplayer.cpp4
1 files changed, 4 insertions, 0 deletions
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");