am e37e9929: am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

* commit 'e37e99290e47bf69ca8a61f795e840bc2c831d75':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
This commit is contained in:
Lajos Molnar
2014-03-19 21:02:52 +00:00
committed by Android Git Automerger

View File

@@ -3128,7 +3128,7 @@ public class MediaPlayer implements SubtitleController.Listener
if (refreshTime ||
nanoTime >= mLastNanoTime + MAX_NS_WITHOUT_POSITION_CHECK) {
try {
mLastTimeUs = mPlayer.getCurrentPosition() * 1000;
mLastTimeUs = mPlayer.getCurrentPosition() * 1000L;
mPaused = !mPlayer.isPlaying();
if (DEBUG) Log.v(TAG, (mPaused ? "paused" : "playing") + " at " + mLastTimeUs);
} catch (IllegalStateException e) {