From 3afa1de7abc62747180ee34827767465586c522b Mon Sep 17 00:00:00 2001 From: Conrad Chen Date: Mon, 20 Mar 2017 14:16:13 -0700 Subject: [PATCH] TIF: Make COLUMN_LOCKED of channels table public Test: cts-tradefed run cts -m CtsTvTestCases Bug: 31340604 Change-Id: I5bf155cb2bdea02f0841ecba0872077cc6609c06 --- api/current.txt | 1 + api/test-current.txt | 1 + media/java/android/media/tv/TvContract.java | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 24a1de963d12e..7d40ae069be7d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24596,6 +24596,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"; diff --git a/api/test-current.txt b/api/test-current.txt index b665a036b46c7..27b5d3822245c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -24697,6 +24697,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"; diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index c28aa5ec8711f..6808b57c26421 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -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. * + *

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. + *

Type: INTEGER (boolean) - * @hide */ - @SystemApi public static final String COLUMN_LOCKED = "locked"; /**