New API on VideoView widget to suspend/resume a session. Do not release the... (2e1818a4) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -211739,6 +211739,17 @@
		<parameter name="measureSpec" type="int">
		</parameter>
		</method>
		<method name="resume"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="seekTo"
		return="void"
		abstract="false"
		@@ -211852,6 +211863,17 @@
		visibility="public"
		>
		</method>
		<method name="suspend"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		</class>
		<class name="ViewAnimator"
		extends="android.widget.FrameLayout"

core/java/android/widget/VideoView.java

+41 −3

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		private static final int STATE_PLAYING = 3;
		private static final int STATE_PAUSED = 4;
		private static final int STATE_PLAYBACK_COMPLETED = 5;
		private static final int STATE_SUSPEND = 6;
		private static final int STATE_RESUME = 7;

		// mCurrentState is a VideoView object's current state.
		// mTargetState is the state that a method caller intends to reach.
		@@ -87,6 +89,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		private boolean mCanPause;
		private boolean mCanSeekBack;
		private boolean mCanSeekForward;
		private int mStateWhenSuspended; //state before calling suspend()

		public VideoView(Context context) {
		super(context);
		@@ -466,15 +469,21 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		public void surfaceCreated(SurfaceHolder holder)
		{
		mSurfaceHolder = holder;
		//resume() was called before surfaceCreated()
		if (mMediaPlayer != null && mCurrentState == STATE_SUSPEND
		&& mTargetState == STATE_RESUME) {
		mMediaPlayer.setDisplay(mSurfaceHolder);
		resume();
		} else {
		openVideo();
		}
		}

		public void surfaceDestroyed(SurfaceHolder holder)
		{
		// after we return from this we can't use the surface any more
		mSurfaceHolder = null;
		if (mMediaController != null) mMediaController.hide();
		release(true);
		}
		};

		@@ -567,6 +576,35 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		mTargetState = STATE_PAUSED;
		}

		public void suspend() {
		if (isInPlaybackState()) {
		if (mMediaPlayer.suspend()) {
		mStateWhenSuspended = mCurrentState;
		mCurrentState = STATE_SUSPEND;
		mTargetState = STATE_SUSPEND;
		} else {
		Log.w(TAG, "Unable to suspend video");
		mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
		}
		}
		}

		public void resume() {
		if (mSurfaceHolder == null && mCurrentState == STATE_SUSPEND){
		mTargetState = STATE_RESUME;
		return;
		}
		if (mMediaPlayer != null && mCurrentState == STATE_SUSPEND) {
		if (mMediaPlayer.resume()) {
		mCurrentState = mStateWhenSuspended;
		mTargetState = mStateWhenSuspended;
		} else {
		Log.w(TAG, "Unable to resume video");
		mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
		}
		}
		}

		// cache duration as mDuration for faster access
		public int getDuration() {
		if (isInPlaybackState()) {