Reboot the EPG permissions

Remove both READ_EPG_DATA and WRITE_EPG_DATA permissions that have not
been used effectively and instead add a new READ_TV_LISTINGS permission
that allows EPG apps to access the TV listings from all channel sources.

Bug: 20124415
Change-Id: Ic83ad99664dfcecf0dde33a34f2c79d953deac77
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d5fef15..fccd6cf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,17 +19,10 @@
 
     <!-- Allows an application to read (but not write) the TV channel/program
          data. -->
-    <permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"
+    <permission android:name="android.permission.READ_TV_LISTINGS"
         android:protectionLevel="dangerous"
-        android:label="@string/permlab_readEpgData"
-        android:description="@string/permdesc_readEpgData" />
-
-    <!-- Allows an application to write (but not read) the TV channel/program
-         data. -->
-    <permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"
-        android:protectionLevel="dangerous"
-        android:label="@string/permlab_writeEpgData"
-        android:description="@string/permdesc_writeEpgData" />
+        android:label="@string/permlab_readTvListings"
+        android:description="@string/permdesc_readTvListings" />
 
     <!-- Allows an application to read and write all TV channel/program data.
          @hide -->
@@ -53,9 +46,7 @@
             android:name="TvProvider"
             android:authorities="android.media.tv"
             android:exported="true"
-            android:syncable="true"
-            android:readPermission="com.android.providers.tv.permission.READ_EPG_DATA"
-            android:writePermission="com.android.providers.tv.permission.WRITE_EPG_DATA" />
+            android:syncable="true" />
 
         <service android:name="EpgDataCleanupService" />
     </application>