1 files changed, 7 insertions, 13 deletions

diff --git a/src/com/android/tv/dvr/DvrRecordingService.java b/src/com/android/tv/dvr/DvrRecordingService.java
index 2f3abccf..d0e86d50 100644
--- a/src/com/android/tv/dvr/DvrRecordingService.java
+++ b/src/com/android/tv/dvr/DvrRecordingService.java
@@ -31,8 +31,7 @@ import com.android.tv.ApplicationSingletons;
 import com.android.tv.TvApplication;
 import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.util.Clock;
-import com.android.tv.util.RecurringRunner;
-import com.android.tv.common.SoftPreconditions;
+import com.android.tv.util.SoftPreconditions;
 
 /**
  * DVR Scheduler service.
@@ -58,8 +57,6 @@ public class DvrRecordingService extends Service {
         context.startService(dvrSchedulerIntent);
     }
 
-    private final Clock mClock = Clock.SYSTEM;
-    private RecurringRunner mReaperRunner;
     private WritableDvrDataManager mDataManager;
 
     /**
@@ -89,16 +86,14 @@ public class DvrRecordingService extends Service {
         AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
         // mScheduler may have been set for testing.
         if (mScheduler == null) {
+            DvrSessionManager sessionManager = singletons.getDvrSessionManger();
             mHandlerThread = new HandlerThread(HANDLER_THREAD_NAME);
             mHandlerThread.start();
-            mScheduler = new Scheduler(mHandlerThread.getLooper(), singletons.getDvrManager(),
-                    singletons.getDvrSessionManger(), mDataManager,
-                    singletons.getChannelDataManager(), this, mClock, alarmManager);
+            mScheduler = new Scheduler(mHandlerThread.getLooper(), sessionManager, mDataManager,
+                    this, Clock.SYSTEM,
+                    alarmManager);
         }
-        mDataManager.addScheduledRecordingListener(mScheduler);
-        mReaperRunner = new RecurringRunner(this, java.util.concurrent.TimeUnit.DAYS.toMillis(1),
-                new ScheduledProgramReaper(mDataManager, mClock), null);
-        mReaperRunner.start();
+        mDataManager.addListener(mScheduler);
     }
 
     @Override
@@ -111,8 +106,7 @@ public class DvrRecordingService extends Service {
     @Override
     public void onDestroy() {
         if (DEBUG) Log.d(TAG, "onDestroy");
-        mReaperRunner.stop();
-        mDataManager.removeScheduledRecordingListener(mScheduler);
+        mDataManager.removeListener(mScheduler);
         mScheduler = null;
         if (mHandlerThread != null) {
             mHandlerThread.quit();