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