Merge "TIF: fix documentation in TvContract" into oc-dev (edf3936f) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/TvContract.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -1488,8 +1488,7 @@ public final class TvContract {
		/**
		* The URI for the preview video.
		*
		* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}. The data in the column must be
		* a URL, or a URI in one of the following formats:
		* <p>The data in the column must be a URL, or a URI in one of the following formats:
		*
		* <ul>
		* <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>
		@@ -1505,9 +1504,8 @@ public final class TvContract {
		String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";

		/**
		* The last playback position (in milliseconds) of the preview video.
		*
		* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}.
		* The last playback position (in milliseconds) of the original content of this preview
		* program.
		*
		* <p>Can be empty.
		*
		@@ -1517,9 +1515,7 @@ public final class TvContract {
		"last_playback_position_millis";

		/**
		* The duration (in milliseconds) of the preview video.
		*
		* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}.
		* The duration (in milliseconds) of the original content of this preview program.
		*
		* <p>Can be empty.
		*