1 files changed, 6 insertions, 64 deletions

diff --git a/src/com/android/tv/modules/TvApplicationModule.java b/src/com/android/tv/modules/TvApplicationModule.java
index 99753d1e..45383ae1 100644
--- a/src/com/android/tv/modules/TvApplicationModule.java
+++ b/src/com/android/tv/modules/TvApplicationModule.java
@@ -16,101 +16,43 @@
 package com.android.tv.modules;
 
 import android.content.Context;
-
 import com.android.tv.MainActivity;
-import com.android.tv.SetupPassthroughActivity;
 import com.android.tv.TvApplication;
-import com.android.tv.common.buildtype.BuildTypeModule;
 import com.android.tv.common.concurrent.NamedThreadFactory;
 import com.android.tv.common.dagger.ApplicationModule;
 import com.android.tv.common.dagger.annotations.ApplicationContext;
-import com.android.tv.data.ChannelDataManager;
-import com.android.tv.data.ChannelDataManagerFactory;
-import com.android.tv.data.epg.EpgFetchService;
-import com.android.tv.data.epg.EpgFetcher;
-import com.android.tv.data.epg.EpgFetcherImpl;
-import com.android.tv.dialog.PinDialogFragment;
-import com.android.tv.dvr.DvrDataManager;
-import com.android.tv.dvr.DvrDataManagerImpl;
-import com.android.tv.dvr.WritableDvrDataManager;
-import com.android.tv.dvr.ui.playback.DvrPlaybackActivity;
 import com.android.tv.onboarding.OnboardingActivity;
-import com.android.tv.onboarding.SetupSourcesFragment;
-import com.android.tv.setup.SystemSetupActivity;
-import com.android.tv.ui.DetailsActivity;
 import com.android.tv.util.AsyncDbTask;
 import com.android.tv.util.TvInputManagerHelper;
-
-import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import dagger.android.ContributesAndroidInjector;
-
-import com.android.tv.common.flags.LegacyFlags;
-
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-
 import javax.inject.Singleton;
 
 /** Dagger module for {@link TvApplication}. */
 @Module(
         includes = {
             ApplicationModule.class,
-            BuildTypeModule.class,
-            DetailsActivity.Module.class,
-            DvrPlaybackActivity.Module.class,
-            MainActivity.Module.class,
-            OnboardingActivity.Module.class,
-            SetupPassthroughActivity.Module.class,
-            SetupSourcesFragment.ContentFragment.Module.class,
-            SystemSetupActivity.Module.class,
             TvSingletonsModule.class,
+            MainActivity.Module.class,
+            OnboardingActivity.Module.class
         })
-public abstract class TvApplicationModule {
+public class TvApplicationModule {
     private static final NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("tv-app-db");
 
     @Provides
     @AsyncDbTask.DbExecutor
     @Singleton
-    static Executor providesDbExecutor() {
+    Executor providesDbExecutor() {
         return Executors.newSingleThreadExecutor(THREAD_FACTORY);
     }
 
     @Provides
     @Singleton
-    static TvInputManagerHelper providesTvInputManagerHelper(
-            @ApplicationContext Context context, LegacyFlags legacyFlags) {
-        TvInputManagerHelper tvInputManagerHelper = new TvInputManagerHelper(context, legacyFlags);
+    TvInputManagerHelper providesTvInputManagerHelper(@ApplicationContext Context context) {
+        TvInputManagerHelper tvInputManagerHelper = new TvInputManagerHelper(context);
         tvInputManagerHelper.start();
-        // Since this is injected as a Lazy in the application start is delayed.
         return tvInputManagerHelper;
     }
-
-    @Provides
-    @Singleton
-    static ChannelDataManager providesChannelDataManager(ChannelDataManagerFactory factory) {
-        ChannelDataManager channelDataManager = factory.create();
-        channelDataManager.start();
-        // Since this is injected as a Lazy in the application start is delayed.
-        return channelDataManager;
-    }
-
-    @Binds
-    @Singleton
-    abstract DvrDataManager providesDvrDataManager(DvrDataManagerImpl impl);
-
-    @Binds
-    @Singleton
-    abstract WritableDvrDataManager providesWritableDvrDataManager(DvrDataManagerImpl impl);
-
-    @Binds
-    @Singleton
-    abstract EpgFetcher epgFetcher(EpgFetcherImpl impl);
-
-    @ContributesAndroidInjector
-    abstract PinDialogFragment contributesPinDialogFragment();
-
-    @ContributesAndroidInjector
-    abstract EpgFetchService contributesEpgFetchService();
 }