release-request-6c9f747d-7df5-465f-8bde-1149394b99b4-for-git_oc-mr1-release-4296189 snap-temp-L54400000096309002

Change-Id: I3da3199d961096b17459c3c9ca1b9db06863edc4

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);