Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438be2af authored by Conrad Chen's avatar Conrad Chen Committed by Android (Google) Code Review
Browse files

Merge "TIF: open transient columns to public" into oc-dev

parents 33422098 e710843f

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24562,6 +24562,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";
@@ -24639,6 +24640,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";

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24675,6 +24675,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";
@@ -24752,6 +24753,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";

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

+2 −5
Original line number Diff line number Diff line
@@ -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";



        /**