Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33

Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b

1 files changed, 16 insertions, 2 deletions

diff --git a/src/com/android/tv/ApplicationSingletons.java b/src/com/android/tv/ApplicationSingletons.java
index 5198f7fd..fd125d52 100644
--- a/src/com/android/tv/ApplicationSingletons.java
+++ b/src/com/android/tv/ApplicationSingletons.java
@@ -18,11 +18,15 @@ package com.android.tv;
 
 import com.android.tv.analytics.Analytics;
 import com.android.tv.analytics.Tracker;
+import com.android.tv.config.RemoteConfig;
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.ProgramDataManager;
 import com.android.tv.dvr.DvrDataManager;
 import com.android.tv.dvr.DvrManager;
-import com.android.tv.dvr.DvrSessionManager;
+import com.android.tv.dvr.DvrScheduleManager;
+import com.android.tv.dvr.DvrStorageStatusManager;
+import com.android.tv.dvr.DvrWatchedPositionManager;
+import com.android.tv.util.AccountHelper;
 import com.android.tv.util.TvInputManagerHelper;
 
 /**
@@ -36,9 +40,15 @@ public interface ApplicationSingletons {
 
     DvrDataManager getDvrDataManager();
 
+    DvrStorageStatusManager getDvrStorageStatusManager();
+
+    DvrScheduleManager getDvrScheduleManager();
+
     DvrManager getDvrManager();
 
-    DvrSessionManager getDvrSessionManger();
+    DvrWatchedPositionManager getDvrWatchedPositionManager();
+
+    InputSessionManager getInputSessionManager();
 
     ProgramDataManager getProgramDataManager();
 
@@ -47,4 +57,8 @@ public interface ApplicationSingletons {
     TvInputManagerHelper getTvInputManagerHelper();
 
     MainActivityWrapper getMainActivityWrapper();
+
+    AccountHelper getAccountHelper();
+
+    RemoteConfig getRemoteConfig();
 }