Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev

Browse Source 
am: af326ed2b9

* commit 'af326ed2b9e35dbd60fbe44d13f8ca7738c97340':
  TIF: Add android.permission.READ_TV_LISTINGS
This commit is contained in:
Jae Seo
2016-02-22 23:50:22 +00:00
committed by android-build-merger
parent 0079d93dba af326ed2b9
commit 43ddc14d5d
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -22752,6 +22752,7 @@ package android.media.tv {
method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
method public static final android.net.Uri buildRecordedProgramUri(long);
field public static final java.lang.String AUTHORITY = "android.media.tv";
field public static final java.lang.String PERMISSION_READ_TV_LISTINGS = "android.permission.READ_TV_LISTINGS";
}
public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

1
api/system-current.txt
View File

@@ -24375,6 +24375,7 @@ package android.media.tv {
method public static final android.net.Uri buildRecordedProgramUri(long);
method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);
field public static final java.lang.String AUTHORITY = "android.media.tv";
field public static final java.lang.String PERMISSION_READ_TV_LISTINGS = "android.permission.READ_TV_LISTINGS";
}
public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

1
api/test-current.txt
View File

@@ -22761,6 +22761,7 @@ package android.media.tv {
method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
method public static final android.net.Uri buildRecordedProgramUri(long);
field public static final java.lang.String AUTHORITY = "android.media.tv";
field public static final java.lang.String PERMISSION_READ_TV_LISTINGS = "android.permission.READ_TV_LISTINGS";
}
public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

6
media/java/android/media/tv/TvContract.java
View File

@@ -53,6 +53,12 @@ public final class TvContract {
/** The authority for the TV provider. */
public static final String AUTHORITY = "android.media.tv";
/**
* Permission to read TV listings. This is required to read all the TV channel and program
* information available on the system.
*/
public static final String PERMISSION_READ_TV_LISTINGS = "android.permission.READ_TV_LISTINGS";
private static final String PATH_CHANNEL = "channel";
private static final String PATH_PROGRAM = "program";
private static final String PATH_RECORDED_PROGRAM = "recorded_program";