Use DvrDataManager interfaces when possible

PiperOrigin-RevId: 250922555
Change-Id: Ic2626453c5a203a4e0ba5c700d51a695c679f988

2 files changed, 10 insertions, 6 deletions

diff --git a/src/com/android/tv/dvr/DvrScheduleManager.java b/src/com/android/tv/dvr/DvrScheduleManager.java
index 7202dce0..5495d891 100644
--- a/src/com/android/tv/dvr/DvrScheduleManager.java
+++ b/src/com/android/tv/dvr/DvrScheduleManager.java
@@ -25,6 +25,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.util.ArraySet;
 import android.util.Range;
+
 import com.android.tv.TvSingletons;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.data.ChannelDataManager;
@@ -37,6 +38,7 @@ import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.dvr.recorder.InputTaskScheduler;
 import com.android.tv.util.CompositeComparator;
 import com.android.tv.util.Utils;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -76,7 +78,7 @@ public class DvrScheduleManager {
                     ScheduledRecording.ID_COMPARATOR);
 
     private final Context mContext;
-    private final DvrDataManagerImpl mDataManager;
+    private final DvrDataManager mDataManager;
     private final ChannelDataManager mChannelDataManager;
 
     private final Map<String, List<ScheduledRecording>> mInputScheduleMap = new HashMap<>();
@@ -95,7 +97,7 @@ public class DvrScheduleManager {
     public DvrScheduleManager(Context context) {
         mContext = context;
         TvSingletons tvSingletons = TvSingletons.getSingletons(context);
-        mDataManager = (DvrDataManagerImpl) tvSingletons.getDvrDataManager();
+        mDataManager = tvSingletons.getDvrDataManager();
         mChannelDataManager = tvSingletons.getChannelDataManager();
         if (mDataManager.isDvrScheduleLoadFinished() && mChannelDataManager.isDbLoadFinished()) {
             buildData();
diff --git a/src/com/android/tv/dvr/provider/DvrDbSync.java b/src/com/android/tv/dvr/provider/DvrDbSync.java
index 7658ca45..b801ace0 100644
--- a/src/com/android/tv/dvr/provider/DvrDbSync.java
+++ b/src/com/android/tv/dvr/provider/DvrDbSync.java
@@ -29,17 +29,19 @@ import android.os.Looper;
 import android.support.annotation.MainThread;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
+
 import com.android.tv.TvSingletons;
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.Program;
 import com.android.tv.dvr.DvrDataManager.ScheduledRecordingListener;
-import com.android.tv.dvr.DvrDataManagerImpl;
 import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.WritableDvrDataManager;
 import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.dvr.recorder.SeriesRecordingScheduler;
 import com.android.tv.util.AsyncDbTask.AsyncQueryProgramTask;
 import com.android.tv.util.TvUriMatcher;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -67,7 +69,7 @@ public class DvrDbSync {
 
     private final Context mContext;
     private final DvrManager mDvrManager;
-    private final DvrDataManagerImpl mDataManager;
+    private final WritableDvrDataManager mDataManager;
     private final ChannelDataManager mChannelDataManager;
     private final Executor mDbExecutor;
     private final Queue<Long> mProgramIdQueue = new LinkedList<>();
@@ -138,7 +140,7 @@ public class DvrDbSync {
                 }
             };
 
-    public DvrDbSync(Context context, DvrDataManagerImpl dataManager) {
+    public DvrDbSync(Context context, WritableDvrDataManager dataManager) {
         this(
                 context,
                 dataManager,
@@ -151,7 +153,7 @@ public class DvrDbSync {
     @VisibleForTesting
     DvrDbSync(
             Context context,
-            DvrDataManagerImpl dataManager,
+            WritableDvrDataManager dataManager,
             ChannelDataManager channelDataManager,
             DvrManager dvrManager,
             SeriesRecordingScheduler seriesRecordingScheduler,