commit f7b33e8656599ed3e0edd834a03a0366b0f655bb
author Lajos Molnar <lajos@google.com> Wed Mar 19 20:43:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 19 20:43:23 2014 +0000
tree e36bb6005db6fe4227d7cf6d341438bb3e94a825
parent 55b523cc3fac7fd008094b690a0fa8c5527d569c
parent 0cab07d78844b71caa2b33d2fac3ab85de77ac2a

Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

media/java/android/media/MediaPlayer.java

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 706258a..2c16b5eef6 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -3128,7 +3128,7 @@
                 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) {