summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-03-10 17:21:49 -0700
committerLajos Molnar <lajos@google.com>2014-03-19 11:35:17 -0700
commit0cab07d78844b71caa2b33d2fac3ab85de77ac2a (patch)
treee544fb252cedf820330eacceb7a183e7283ea9cf /media
parent5d3d4ee3005e910dce780074d3f68d594aa12070 (diff)
downloadframeworks_base-0cab07d78844b71caa2b33d2fac3ab85de77ac2a.zip
frameworks_base-0cab07d78844b71caa2b33d2fac3ab85de77ac2a.tar.gz
frameworks_base-0cab07d78844b71caa2b33d2fac3ab85de77ac2a.tar.bz2
MediaPlayer: fix int overflow issue in MediaTimeProvider
Bug: 13394783 Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaPlayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 706258a..2c16b5e 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -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) {