1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/tv/data/epg/EpgFetchHelper.java b/src/com/android/tv/data/epg/EpgFetchHelper.java
index 4e889115..3843ca99 100644
--- a/src/com/android/tv/data/epg/EpgFetchHelper.java
+++ b/src/com/android/tv/data/epg/EpgFetchHelper.java
@@ -28,15 +28,12 @@ import android.preference.PreferenceManager;
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Log;
-
 import com.android.tv.common.CommonConstants;
 import com.android.tv.common.util.Clock;
-import com.android.tv.data.ProgramImpl;
+import com.android.tv.data.Program;
 import com.android.tv.data.api.Channel;
-import com.android.tv.data.api.Program;
 import com.android.tv.features.TvFeatures;
 import com.android.tv.util.TvProviderUtils;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -109,7 +106,7 @@ class EpgFetchHelper {
                     ops.add(
                             ContentProviderOperation.newUpdate(
                                             TvContract.buildProgramUri(oldProgram.getId()))
-                                    .withValues(ProgramImpl.toContentValues(newProgram, context))
+                                    .withValues(Program.toContentValues(newProgram, context))
                                     .build());
                     oldProgramsIndex++;
                     newProgramsIndex++;
@@ -135,7 +132,7 @@ class EpgFetchHelper {
             if (addNewProgram) {
                 ops.add(
                         ContentProviderOperation.newInsert(Programs.CONTENT_URI)
-                                .withValues(ProgramImpl.toContentValues(newProgram, context))
+                                .withValues(Program.toContentValues(newProgram, context))
                                 .build());
             }
             // Throttle the batch operation not to cause TransactionTooLargeException.
@@ -202,7 +199,7 @@ class EpgFetchHelper {
     @WorkerThread
     private static List<Program> queryPrograms(
             Context context, long channelId, long startTimeMs, long endTimeMs) {
-        String[] projection = ProgramImpl.PROJECTION;
+        String[] projection = Program.PROJECTION;
         if (TvProviderUtils.checkSeriesIdColumn(context, Programs.CONTENT_URI)) {
             projection =
                     TvProviderUtils.addExtraColumnsToProjection(
@@ -222,7 +219,7 @@ class EpgFetchHelper {
             }
             ArrayList<Program> programs = new ArrayList<>();
             while (c.moveToNext()) {
-                programs.add(ProgramImpl.fromCursor(c));
+                programs.add(Program.fromCursor(c));
             }
             return programs;
         }