summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2014-08-25 06:17:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-25 06:17:56 +0000
commit1c50575a38683e92d98e2306e2fcb8db7193ce83 (patch)
treeead48cadbdf1d74848bac264953090bcb6a48c97
parentac0d62a1181bde3724f9a794cc4a96b2a4a90587 (diff)
parent8d0b268e42077bab8948de08963cc499e7ad1030 (diff)
downloadframeworks_base-1c50575a38683e92d98e2306e2fcb8db7193ce83.zip
frameworks_base-1c50575a38683e92d98e2306e2fcb8db7193ce83.tar.gz
frameworks_base-1c50575a38683e92d98e2306e2fcb8db7193ce83.tar.bz2
Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev
-rw-r--r--media/java/android/media/tv/TvContract.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index bdceb24..00c7ad4 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -686,6 +686,7 @@ public final class TvContract {
* </p>
* @hide
*/
+ @SystemApi
public static final String COLUMN_BROWSABLE = "browsable";
/**
@@ -717,6 +718,7 @@ public final class TvContract {
* </p>
* @hide
*/
+ @SystemApi
public static final String COLUMN_LOCKED = "locked";
/**