Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev (306afb91) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -39689,6 +39689,7 @@ package android.widget {
		method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
		method public void setVideoPath(java.lang.String);
		method public void setVideoURI(android.net.Uri);
		method public void setVideoURI(android.net.Uri, java.util.Map<java.lang.String, java.lang.String>);
		method public void start();
		method public void stopPlayback();
		method public void suspend();

+14 −1

Original line number	Diff line number	Diff line
		@@ -230,16 +230,29 @@ public class VideoView extends SurfaceView
		mTargetState = STATE_IDLE;
		}

		/**
		* Sets video path.
		*
		* @param path the path of the video.
		*/
		public void setVideoPath(String path) {
		setVideoURI(Uri.parse(path));
		}

		/**
		* Sets video URI.
		*
		* @param uri the URI of the video.
		*/
		public void setVideoURI(Uri uri) {
		setVideoURI(uri, null);
		}

		/**
		* @hide
		* Sets video URI using specific headers.
		*
		* @param uri the URI of the video.
		* @param headers the headers for the URI request.
		*/
		public void setVideoURI(Uri uri, Map<String, String> headers) {
		mUri = uri;