From 5bd4840e4ef9474dd1e0c90efc996d2b00cf0037 Mon Sep 17 00:00:00 2001
From: nchalko <nchalko@google.com>
Date: Tue, 18 Dec 2018 12:26:40 -0800
Subject: Create a Optional BuiltInTunerManager

This manager is absent if the tuner is not enabled.

PiperOrigin-RevId: 226039646
Change-Id: Ib71a3a9abd361794048ea8917300a9f2187ea3d2
---
 src/com/android/tv/app/LiveTvApplication.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/com/android/tv/app')

diff --git a/src/com/android/tv/app/LiveTvApplication.java b/src/com/android/tv/app/LiveTvApplication.java
index 903b5def..db20846c 100644
--- a/src/com/android/tv/app/LiveTvApplication.java
+++ b/src/com/android/tv/app/LiveTvApplication.java
@@ -37,7 +37,7 @@ import com.android.tv.perf.PerformanceMonitor;
 import com.android.tv.perf.PerformanceMonitorManagerFactory;
 import com.android.tv.tuner.livetuner.LiveTvTunerTvInputService;
 import com.android.tv.tuner.setup.LiveTvTunerSetupActivity;
-import com.android.tv.tunerinputcontroller.TunerInputController;
+import com.android.tv.tunerinputcontroller.BuiltInTunerManager;
 import com.android.tv.util.account.AccountHelper;
 import com.android.tv.util.account.AccountHelperImpl;
 import com.google.common.base.Optional;
@@ -59,7 +59,6 @@ public class LiveTvApplication extends TvApplication {
                 }
             };
 
-    private final Optional<TunerInputController> mOptionalTunerInputController = Optional.absent();
     private final DefaultBackendKnobsFlags mBackendKnobsFlags = new DefaultBackendKnobsFlags();
     private final DefaultCloudEpgFlags mCloudEpgFlags = new DefaultCloudEpgFlags();
     private final DefaultConcurrentDvrPlaybackFlags mConcurrentDvrPlaybackFlags =
@@ -157,8 +156,8 @@ public class LiveTvApplication extends TvApplication {
     }
 
     @Override
-    public Optional<TunerInputController> getTunerInputController() {
-        return mOptionalTunerInputController;
+    public Optional<BuiltInTunerManager> getBuiltInTunerManager() {
+        return Optional.absent();
     }
 
     @Override
-- 
cgit v1.2.3