Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev (f0afad00) · Commits · e / os / android_frameworks_base

core/java/android/widget/VideoView.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -54,7 +54,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;
		@@ -229,7 +228,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);
		@@ -608,17 +606,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() {