1 files changed, 9 insertions, 19 deletions

diff --git a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionExoV2.java b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionExoV2.java
index 7ebb2b21..4eca44d6 100644
--- a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionExoV2.java
+++ b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionExoV2.java
@@ -27,21 +27,15 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.view.Surface;
 import android.view.View;
-
 import com.android.tv.common.CommonPreferences.CommonPreferencesChangedListener;
 import com.android.tv.common.compat.TisSessionCompat;
-import com.android.tv.common.dagger.annotations.ApplicationContext;
 import com.android.tv.tuner.prefs.TunerPreferences;
+import com.android.tv.tuner.source.TsDataSourceManager;
 import com.android.tv.tuner.tvinput.datamanager.ChannelDataManager;
-import com.android.tv.tuner.tvinput.factory.TunerSessionFactory;
-import com.android.tv.tuner.tvinput.factory.TunerSessionFactory.SessionRecordingCallback;
 import com.android.tv.tuner.tvinput.factory.TunerSessionFactory.SessionReleasedCallback;
-
-import com.google.auto.factory.AutoFactory;
-import com.google.auto.factory.Provided;
+import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
 
 /** Provides a tuner TV input session. */
-@AutoFactory(implementing = TunerSessionFactory.class)
 public class TunerSessionExoV2 extends TisSessionCompat
         implements CommonPreferencesChangedListener {
 
@@ -51,26 +45,26 @@ public class TunerSessionExoV2 extends TisSessionCompat
     private final TunerSessionOverlay mTunerSessionOverlay;
     private final TunerSessionWorkerExoV2 mSessionWorker;
     private final SessionReleasedCallback mReleasedCallback;
-    private final SessionRecordingCallback mRecordingCallback;
     private boolean mPlayPaused;
     private long mTuneStartTimestamp;
 
     public TunerSessionExoV2(
-            @Provided @ApplicationContext Context context,
+            Context context,
             ChannelDataManager channelDataManager,
             SessionReleasedCallback releasedCallback,
-            SessionRecordingCallback recordingCallback,
-            @Provided TunerSessionWorkerExoV2.Factory tunerSessionWorkerExoV2Factory) {
+            ConcurrentDvrPlaybackFlags concurrentDvrPlaybackFlags,
+            TsDataSourceManager.Factory tsDataSourceManagerFactory) {
         super(context);
         mReleasedCallback = releasedCallback;
-        mRecordingCallback = recordingCallback;
         mTunerSessionOverlay = new TunerSessionOverlay(context);
         mSessionWorker =
-                tunerSessionWorkerExoV2Factory.create(
+                new TunerSessionWorkerExoV2(
                         context,
                         channelDataManager,
                         this,
-                        mTunerSessionOverlay);
+                        mTunerSessionOverlay,
+                        concurrentDvrPlaybackFlags,
+                        tsDataSourceManagerFactory);
         TunerPreferences.setCommonPreferencesChangedListener(this);
     }
 
@@ -209,8 +203,4 @@ public class TunerSessionExoV2 extends TisSessionCompat
     public void onCommonPreferencesChanged() {
         mSessionWorker.sendMessage(TunerSessionWorkerExoV2.MSG_TUNER_PREFERENCES_CHANGED);
     }
-
-    public Uri getRecordingUri(Uri channelUri) {
-        return mRecordingCallback.getRecordingUri(channelUri);
-    }
 }