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

Commit 77dde67d authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: make Channels.COLUMN_BROWSABLE visible"

parents 90ebaa8d 3bfdf8dd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24175,6 +24175,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";

    field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";

    field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";

    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";

    field public static final java.lang.String COLUMN_DESCRIPTION = "description";

    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";

    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24271,6 +24271,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";

    field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";

    field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";

    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";

    field public static final java.lang.String COLUMN_DESCRIPTION = "description";

    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";

    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

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

+5 −4
Original line number Diff line number Diff line
@@ -1279,14 +1279,15 @@ public final class TvContract { 
        /**

         * The flag indicating whether this TV channel is browsable or not.

         *

         * <p>This column can only be set by applications having proper system permission. For

         * other applications, this is a read-only column.

         *

         * <p>A value of 1 indicates the channel is included in the channel list that applications

         * use to browse channels, a value of 0 indicates the channel is not included in the list.

         * If not specified, this value is set to 0 (not browsable) by default.

         *

         * <p>Type: INTEGER (boolean)

         * @hide

         */

        @SystemApi

        public static final String COLUMN_BROWSABLE = "browsable";



        /**
@@ -2609,8 +2610,8 @@ public final class TvContract { 
        /**

         * The flag indicating whether this TV program is browsable or not.

         *

         * <p>This column can only be set by system apps. For other applications, it is a read-only

         * column. Trying to modify it may cause {@link SecurityException}.

         * <p>This column can only be set by applications having proper system permission. For

         * other applications, this is a read-only column.

         *

         * <p>A value of 1 indicates that the program is browsable and can be shown to users in

         * the UI. A value of 0 indicates that the program should be hidden from users and the