Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev

Browse Source 
am: 05e63bf5fa

Change-Id: If989da1a118d28c85d127c541a6bdbe4b35d9ac2
This commit is contained in:
Dongwon Kang
2017-05-08 21:59:35 +00:00
committed by android-build-merger
parent e6fa70bcec 05e63bf5fa
commit 67c1e3b1a6
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media/java/android/media/tv/TvContract.java
View File

@@ -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);