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

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

Merge "TIF: Make COLUMN_LOCKED of channels table public"

parents b3ba20fe 3afa1de7

api/current.txt

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

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final java.lang.String COLUMN_LOCKED = "locked";

    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";

    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

api/test-current.txt

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

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final java.lang.String COLUMN_LOCKED = "locked";

    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";

    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

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

+3 −2
Original line number Diff line number Diff line
@@ -1971,10 +1971,11 @@ public final class TvContract { 
         * channel is not locked thus the user is not prompted to enter passcode If not specified,

         * this value is set to 0 (not locked) by default.

         *

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

         * modify parental control settings. For other applications, this is a read-only column.



         * <p>Type: INTEGER (boolean)

         * @hide

         */

        @SystemApi

        public static final String COLUMN_LOCKED = "locked";



        /**