Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dc08486 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

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

* commit 'f7b33e86':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
parents 0dca4fc9 f7b33e86

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3128,7 +3128,7 @@ public class MediaPlayer implements SubtitleController.Listener 
                if (refreshTime ||

                if (refreshTime ||

                        nanoTime >= mLastNanoTime + MAX_NS_WITHOUT_POSITION_CHECK) {

                        nanoTime >= mLastNanoTime + MAX_NS_WITHOUT_POSITION_CHECK) {

                    try {

                    try {

                        mLastTimeUs = mPlayer.getCurrentPosition() * 1000;

                        mLastTimeUs = mPlayer.getCurrentPosition() * 1000L;

                        mPaused = !mPlayer.isPlaying();

                        mPaused = !mPlayer.isPlaying();

                        if (DEBUG) Log.v(TAG, (mPaused ? "paused" : "playing") + " at " + mLastTimeUs);

                        if (DEBUG) Log.v(TAG, (mPaused ? "paused" : "playing") + " at " + mLastTimeUs);

                    } catch (IllegalStateException e) {

                    } catch (IllegalStateException e) {