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

Commit af326ed2 authored Feb 22, 2016 by Jae Seo Committed by Android (Google) Code Review Feb 22, 2016

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

parents 4449a27f ed76f350

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 buildProgramsUriForChannel(android.net.Uri, long, long);
	method public static final android.net.Uri buildRecordedProgramUri(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 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 {		public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24375,6 +24375,7 @@ package android.media.tv {
	method public static final android.net.Uri buildRecordedProgramUri(long);		method public static final android.net.Uri buildRecordedProgramUri(long);
	method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);		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 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 {		public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 buildProgramsUriForChannel(android.net.Uri, long, long);
	method public static final android.net.Uri buildRecordedProgramUri(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 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 {		public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,12 @@ public final class TvContract {
	/** The authority for the TV provider. */		/** The authority for the TV provider. */
	public static final String AUTHORITY = "android.media.tv";		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_CHANNEL = "channel";
	private static final String PATH_PROGRAM = "program";		private static final String PATH_PROGRAM = "program";
	private static final String PATH_RECORDED_PROGRAM = "recorded_program";		private static final String PATH_RECORDED_PROGRAM = "recorded_program";