commit af326ed2b9e35dbd60fbe44d13f8ca7738c97340
author Jae Seo <jaeseo@google.com> Mon Feb 22 23:44:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 23:44:48 2016 +0000
tree 51ec596fbb58eaaed1dbc3414e1cb86e7cb90f21
parent 4449a27fe9f518be2c181307c14f28278026ab84
parent ed76f3509dc7129f93ae62b574ca0521f586c278

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index abc9e9a..a17f68f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22752,6 +22752,7 @@
     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 {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 4e7157d..d5c50fb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24375,6 +24375,7 @@
     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 {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3878fbf..f466b8f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -22761,6 +22761,7 @@
     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 {

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

diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index 1c11842..3e6aa9f 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -53,6 +53,12 @@
     /** 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";