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

Commit c653df46 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 8fac23f2: am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it... 

am 8fac23f2: am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev

* commit '8fac23f2':
  Stop caching stream duration, it might change (increase) dynamically.
parents ec45cc09 8fac23f2

core/java/android/widget/VideoView.java

+3 −10
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
    // settable by the client

    private Uri         mUri;

    private Map<String, String> mHeaders;

    private int         mDuration;



    // all possible internal states

    private static final int STATE_ERROR              = -1;
@@ -247,7 +246,6 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
            mMediaPlayer = new MediaPlayer();

            mMediaPlayer.setOnPreparedListener(mPreparedListener);

            mMediaPlayer.setOnVideoSizeChangedListener(mSizeChangedListener);

            mDuration = -1;

            mMediaPlayer.setOnCompletionListener(mCompletionListener);

            mMediaPlayer.setOnErrorListener(mErrorListener);

            mMediaPlayer.setOnInfoListener(mOnInfoListener);
@@ -626,17 +624,12 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
        openVideo();

    }



    // cache duration as mDuration for faster access

    public int getDuration() {

        if (isInPlaybackState()) {

            if (mDuration > 0) {

                return mDuration;

            return mMediaPlayer.getDuration();

        }

            mDuration = mMediaPlayer.getDuration();

            return mDuration;

        }

        mDuration = -1;

        return mDuration;



        return -1;

    }



    public int getCurrentPosition() {