diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-19 21:02:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 21:02:52 +0000 |
| commit | 53ee9ecd9dcfba58ce700d57dcc648700dc52528 (patch) | |
| tree | 6f97f09ad2a0eb893fbbdfc59553803e7c75411f | |
| parent | 2f8bc12f1529e72535f0a5474d52abae3aaf479d (diff) | |
| parent | e37e99290e47bf69ca8a61f795e840bc2c831d75 (diff) | |
| download | frameworks_base-53ee9ecd9dcfba58ce700d57dcc648700dc52528.zip frameworks_base-53ee9ecd9dcfba58ce700d57dcc648700dc52528.tar.gz frameworks_base-53ee9ecd9dcfba58ce700d57dcc648700dc52528.tar.bz2 | |
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
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index b34cea8..41ba5d6 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) { |