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-10 17:23:45 -0700
commit7246fa56100c186df0c094e21a5d06a3d9545900 (patch)
treeabc9a39d3688a682c190079460a2f77a2696bbe8 /media
parent9bec0f5cc13c2f41cf09e409e134bab537a67e87 (diff)
downloadframeworks_base-7246fa56100c186df0c094e21a5d06a3d9545900.zip
frameworks_base-7246fa56100c186df0c094e21a5d06a3d9545900.tar.gz
frameworks_base-7246fa56100c186df0c094e21a5d06a3d9545900.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 2806bff..e20a4af 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -3069,7 +3069,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) {