commit bc8336297142d7919c4ab3a92217668c99220cf8
author Dongwon Kang <dwkang@google.com> Tue Feb 21 18:09:26 2017 -0800
committer Dongwon Kang <dwkang@google.com> Wed Feb 22 15:52:26 2017 -0800
tree 8fdf90114070eda2871d5af9256f508887c24164
parent 9c7110178fd390ed520e83522ecc5b54835e0778

Fix a trivial bug introduced in merge process

Test: cts-tradefed run cts -m CtsTvTestCases
Change-Id: I743c634c50a62567792ce0ba3884f334a0ec91c4

src/com/android/providers/tv/TvProvider.java

diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index bb9dfa1..5c25e64 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -192,8 +192,6 @@
                 CHANNELS_TABLE + "." + Channels.COLUMN_APP_LINK_COLOR);
         sChannelProjectionMap.put(Channels.COLUMN_APP_LINK_INTENT_URI,
                 CHANNELS_TABLE + "." + Channels.COLUMN_APP_LINK_INTENT_URI);
-        sChannelProjectionMap.put(Channels.COLUMN_INTERNAL_PROVIDER_ID,
-                CHANNELS_TABLE + "." + Channels.COLUMN_INTERNAL_PROVIDER_ID);
         sChannelProjectionMap.put(Channels.COLUMN_INTERNAL_PROVIDER_DATA,
                 CHANNELS_TABLE + "." + Channels.COLUMN_INTERNAL_PROVIDER_DATA);
         sChannelProjectionMap.put(Channels.COLUMN_INTERNAL_PROVIDER_FLAG1,
@@ -210,6 +208,8 @@
                 CHANNELS_TABLE + "." + Channels.COLUMN_TRANSIENT);
         sChannelProjectionMap.put(Channels.COLUMN_SYSTEM_APPROVED,
                 CHANNELS_TABLE + "." + Channels.COLUMN_SYSTEM_APPROVED);
+        sChannelProjectionMap.put(Channels.COLUMN_INTERNAL_PROVIDER_ID,
+                CHANNELS_TABLE + "." + Channels.COLUMN_INTERNAL_PROVIDER_ID);
 
         sProgramProjectionMap = new HashMap<>();
         sProgramProjectionMap.put(Programs._ID, Programs._ID);
@@ -1057,7 +1057,6 @@
     private Uri insertRecordedProgram(Uri uri, ContentValues values) {
         // Mark the owner package of this program.
         values.put(Programs.COLUMN_PACKAGE_NAME, getCallingPackage_());
-        blockIllegalAccessToPreviewProgramsSystemColumns(values);
 
         checkAndConvertGenre(values);
 
@@ -1075,6 +1074,7 @@
     private Uri insertPreviewProgram(Uri uri, ContentValues values) {
         // Mark the owner package of this program.
         values.put(Programs.COLUMN_PACKAGE_NAME, getCallingPackage_());
+        blockIllegalAccessToPreviewProgramsSystemColumns(values);
 
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         long rowId = db.insert(PREVIEW_PROGRAMS_TABLE, null, values);