diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-19 20:52:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 20:52:03 +0000 |
| commit | e128ca437a668e4050f6b81187d5a9c507c5725e (patch) | |
| tree | 676d80813daf915a175abc4f5260f35ee2881528 /media | |
| parent | 5b1375445afef5ce0cbceaa69fc44667e3e358fb (diff) | |
| parent | 0dc084865313a416246915c72b29c13cc3f404d4 (diff) | |
| download | frameworks_base-e128ca437a668e4050f6b81187d5a9c507c5725e.zip frameworks_base-e128ca437a668e4050f6b81187d5a9c507c5725e.tar.gz frameworks_base-e128ca437a668e4050f6b81187d5a9c507c5725e.tar.bz2 | |
am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
* commit '0dc084865313a416246915c72b29c13cc3f404d4':
MediaPlayer: fix int overflow issue in MediaTimeProvider
Diffstat (limited to 'media')
| -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) { |