Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev (05e63bf5) · Commits · e / os / android_frameworks_base

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

+30 −5

Original line number	Diff line number	Diff line
		@@ -1624,7 +1624,12 @@ public final class TvContract {
		/** Column definitions for the TV channels table. */
		public static final class Channels implements BaseTvColumns {

		/** The content:// style URI for this table. */
		/**
		* The content:// style URI for this table.
		*
		* <p>SQL selection is not supported for {@link ContentResolver#query},
		* {@link ContentResolver#update} and {@link ContentResolver#delete} operations.
		*/
		public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/"
		+ PATH_CHANNEL);

		@@ -2423,7 +2428,12 @@ public final class TvContract {
		*/
		public static final class Programs implements BaseTvColumns, ProgramColumns {

		/** The content:// style URI for this table. */
		/**
		* The content:// style URI for this table.
		*
		* <p>SQL selection is not supported for {@link ContentResolver#query},
		* {@link ContentResolver#update} and {@link ContentResolver#delete} operations.
		*/
		public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/"
		+ PATH_PROGRAM);

		@@ -2737,7 +2747,12 @@ public final class TvContract {
		*/
		public static final class RecordedPrograms implements BaseTvColumns, ProgramColumns {

		/** The content:// style URI for this table. */
		/**
		* The content:// style URI for this table.
		*
		* <p>SQL selection is not supported for {@link ContentResolver#query},
		* {@link ContentResolver#update} and {@link ContentResolver#delete} operations.
		*/
		public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/"
		+ PATH_RECORDED_PROGRAM);

		@@ -2858,7 +2873,12 @@ public final class TvContract {
		public static final class PreviewPrograms implements BaseTvColumns, ProgramColumns,
		PreviewProgramColumns {

		/** The content:// style URI for this table. */
		/**
		* The content:// style URI for this table.
		*
		* <p>SQL selection is not supported for {@link ContentResolver#query},
		* {@link ContentResolver#update} and {@link ContentResolver#delete} operations.
		*/
		public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/"
		+ PATH_PREVIEW_PROGRAM);

		@@ -2905,7 +2925,12 @@ public final class TvContract {
		public static final class WatchNextPrograms implements BaseTvColumns, ProgramColumns,
		PreviewProgramColumns {

		/** The content:// style URI for this table. */
		/**
		* The content:// style URI for this table.
		*
		* <p>SQL selection is not supported for {@link ContentResolver#query},
		* {@link ContentResolver#update} and {@link ContentResolver#delete} operations.
		*/
		public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/"
		+ PATH_WATCH_NEXT_PROGRAM);