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

Commit ec321183 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels"

parents 39455174 72529d0f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25628,6 +25628,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_SYSTEM_APPROVED = "system_approved";

    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";

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

+13 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,19 @@ public final class TvContract { 
        @SystemApi

        public static final String COLUMN_TRANSIENT = "transient";



        /**

         * The flag indicating whether this TV channel is approved to be shown by the system.

         *

         * <p>A value of 1 indicates that the channel is approved to be shown by the system, and a

         * value of 0 indicates that the channel is blocked by system. If not specified, this value

         * is set to 0 (not approved) by default.

         *

         * <p>Type: INTEGER (boolean)

         * @hide

         */

        @SystemApi

        public static final String COLUMN_SYSTEM_APPROVED = "system_approved";



        private Channels() {}



        /**