diff options
Diffstat (limited to 'src/com/android/tv/TvApplication.java')
| -rw-r--r-- | src/com/android/tv/TvApplication.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java index 284ca121..5ab8f033 100644 --- a/src/com/android/tv/TvApplication.java +++ b/src/com/android/tv/TvApplication.java @@ -108,7 +108,7 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet @Inject Lazy<ChannelDataManager> mChannelDataManager; private volatile ProgramDataManager mProgramDataManager; private PreviewDataManager mPreviewDataManager; - private DvrManager mDvrManager; + @Inject Lazy<DvrManager> mDvrManager; private DvrScheduleManager mDvrScheduleManager; @Inject Lazy<DvrDataManager> mDvrDataManager; private DvrWatchedPositionManager mDvrWatchedPositionManager; @@ -213,7 +213,6 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet } if (CommonFeatures.DVR.isEnabled(this)) { mDvrScheduleManager = new DvrScheduleManager(this); - mDvrManager = new DvrManager(this); mRecordingScheduler = RecordingScheduler.createScheduler(this); } mEpgFetcher.startRoutineService(); @@ -254,8 +253,9 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet /** Returns the {@link DvrManager}. */ @Override + @Nullable public DvrManager getDvrManager() { - return mDvrManager; + return (CommonFeatures.DVR.isEnabled(this)) ? mDvrManager.get() : null; } /** Returns the {@link DvrScheduleManager}. */ |