Allow inserting programs for other packages if you have the right permissions am: d60d346792

am: b057ca8e31

Change-Id: I67835ca226a58c2647a98deb9c0c7053296e2e08

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index 5abc07d..ff2452e 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -1383,8 +1383,12 @@ public class TvProvider extends ContentProvider {
     }
 
     private Uri insertProgram(Uri uri, ContentValues values) {
-        // Mark the owner package of this program.
-        values.put(Programs.COLUMN_PACKAGE_NAME, getCallingPackage_());
+        if (!callerHasAccessAllEpgDataPermission() ||
+                !values.containsKey(Programs.COLUMN_PACKAGE_NAME)) {
+            // Mark the owner package of this program. System app with a proper permission may
+            // change the owner of the program.
+            values.put(Programs.COLUMN_PACKAGE_NAME, getCallingPackage_());
+        }
 
         checkAndConvertGenre(values);
         checkAndConvertDeprecatedColumns(values);