summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Conrad Chen <conradchen@google.com> 2017-03-27 13:22:06 -0700
committer Conrad Chen <conradchen@google.com> 2017-03-28 18:41:45 +0000
commite710843fc780047fceaaecae86499c5d302f30dc (patch)
tree42631aec27164ceb79f4733d861c304830d99269
parent3ab5c0173a7371c1757c52029cde5f4f84d3bd22 (diff)
TIF: open transient columns to public
Test: build Bug: 36557756 Change-Id: Ieb45ee5e6bd27fb33d84799ec1510a410ff7b027
-rw-r--r--api/current.txt2
-rw-r--r--api/test-current.txt2
-rw-r--r--media/java/android/media/tv/TvContract.java7
3 files changed, 6 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt
index e6363dbd8992..eb0d43cc21ba 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24560,6 +24560,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";
field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
+ field public static final java.lang.String COLUMN_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS";
field public static final java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS";
@@ -24637,6 +24638,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
+ field public static final java.lang.String COLUMN_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
diff --git a/api/test-current.txt b/api/test-current.txt
index b09136e54304..337e20556e3e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -24673,6 +24673,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";
field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
+ field public static final java.lang.String COLUMN_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS";
field public static final java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS";
@@ -24750,6 +24751,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
+ field public static final java.lang.String COLUMN_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index 6808b57c2642..7bf69c06ab5e 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -1321,9 +1321,7 @@ public final class TvContract {
*
* <p>Type: INTEGER (boolean)
* @see Channels#COLUMN_TRANSIENT
- * @hide
*/
- @SystemApi
public static final String COLUMN_TRANSIENT = "transient";
/**
@@ -2164,10 +2162,9 @@ public final class TvContract {
* specified, this value is set to 0 (not transient) by default.
*
* <p>Type: INTEGER (boolean)
- * @see Programs#COLUMN_TRANSIENT
- * @hide
+ * @see PreviewPrograms#COLUMN_TRANSIENT
+ * @see WatchNextPrograms#COLUMN_TRANSIENT
*/
- @SystemApi
public static final String COLUMN_TRANSIENT = "transient";
/**