diff options
| author | 2017-03-23 22:31:01 +0000 | |
|---|---|---|
| committer | 2017-03-23 22:31:09 +0000 | |
| commit | ca47020270f85e328d17df67eba764ff8cd5092b (patch) | |
| tree | b5a37b57e3c89b706d605467ec286e863ec4a4b4 | |
| parent | b3ba20fe52b0b78e8fb3dffa693e80e4b69930cc (diff) | |
| parent | 3afa1de7abc62747180ee34827767465586c522b (diff) | |
Merge "TIF: Make COLUMN_LOCKED of channels table public"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | 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 6ea8e9899abd..d61b7a86e567 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/test-current.txt b/api/test-current.txt index 812f789a5a91..8098440a9bb2 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index c28aa5ec8711..6808b57c2642 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. * + * <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"; /** |