CLEANUP: Extract a TunerInputController interface

PiperOrigin-RevId: 204522037
Change-Id: Idd926a0286770a7bcd943f03856865ce32ac7c7c

7 files changed, 46 insertions, 13 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f6911e0..5c015fb4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -292,7 +292,7 @@
           of MainActivity
         -->
         <receiver
-            android:name="com.android.tv.tuner.TunerInputController$IntentReceiver"
+            android:name="com.android.tv.tuner.TunerInputControllerImpl$IntentReceiver"
             android:exported="false" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java
index d25c3a06..a91eff5f 100644
--- a/src/com/android/tv/TvApplication.java
+++ b/src/com/android/tv/TvApplication.java
@@ -60,8 +60,9 @@ import com.android.tv.perf.PerformanceMonitorManager;
 import com.android.tv.perf.PerformanceMonitorManagerFactory;
 import com.android.tv.recommendation.ChannelPreviewUpdater;
 import com.android.tv.recommendation.RecordedProgramPreviewUpdater;
-import com.android.tv.tuner.TunerInputController;
+import com.android.tv.tuner.TunerInputControllerImpl;
 import com.android.tv.tuner.util.TunerInputInfoUtils;
+import com.android.tv.tunerinputcontroller.TunerInputController;
 import com.android.tv.util.SetupUtils;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.Utils;
@@ -357,7 +358,7 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet
     public synchronized TunerInputController getTunerInputController() {
         if (mTunerInputController == null) {
             mTunerInputController =
-                    new TunerInputController(
+                    new TunerInputControllerImpl(
                             ComponentName.unflattenFromString(getEmbeddedTunerInputId()));
         }
         return mTunerInputController;
diff --git a/src/com/android/tv/TvSingletons.java b/src/com/android/tv/TvSingletons.java
index 0c7f78a3..e4e6b1bd 100644
--- a/src/com/android/tv/TvSingletons.java
+++ b/src/com/android/tv/TvSingletons.java
@@ -33,7 +33,7 @@ import com.android.tv.dvr.DvrScheduleManager;
 import com.android.tv.dvr.DvrWatchedPositionManager;
 import com.android.tv.dvr.recorder.RecordingScheduler;
 import com.android.tv.perf.PerformanceMonitor;
-import com.android.tv.tuner.TunerInputController;
+import com.android.tv.tunerinputcontroller.TunerInputController;
 import com.android.tv.util.SetupUtils;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.account.AccountHelper;
diff --git a/src/com/android/tv/tuner/TunerInputController.java b/src/com/android/tv/tuner/TunerInputControllerImpl.java
index 8a440464..88419be5 100644
--- a/src/com/android/tv/tuner/TunerInputController.java
+++ b/src/com/android/tv/tuner/TunerInputControllerImpl.java
@@ -59,6 +59,7 @@ import com.android.tv.common.util.SystemPropertiesProxy;
 
 import com.android.tv.tuner.setup.BaseTunerSetupActivity;
 import com.android.tv.tuner.util.TunerInputInfoUtils;
+import com.android.tv.tunerinputcontroller.TunerInputController;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
@@ -75,7 +76,7 @@ import java.util.concurrent.TimeUnit;
  * UsbManager.ACTION_USB_DEVICE_ATTACHED}, and {@code UsbManager.ACTION_USB_DEVICE_ATTACHED} to
  * update the connection status of the supported USB TV tuners.
  */
-public class TunerInputController {
+public class TunerInputControllerImpl implements TunerInputController {
     private static final boolean DEBUG = false;
     private static final String TAG = "TunerInputController";
     private static final String PREFERENCE_IS_NETWORK_TUNER_ATTACHED = "network_tuner";
@@ -118,7 +119,7 @@ public class TunerInputController {
 
     private final CheckDvbDeviceHandler mHandler = new CheckDvbDeviceHandler(this);
 
-    public TunerInputController(ComponentName embeddedTuner) {
+    public TunerInputControllerImpl(ComponentName embeddedTuner) {
         usbTunerComponent = embeddedTuner;
         networkTunerComponent = usbTunerComponent;
         builtInTunerComponent = usbTunerComponent;
@@ -128,6 +129,7 @@ public class TunerInputController {
     }
 
     /** Checks status of USB devices to see if there are available USB tuners connected. */
+    @Override
     public void onCheckingUsbTunerStatus(Context context, String action) {
         onCheckingUsbTunerStatus(context, action, mHandler);
     }
@@ -319,6 +321,7 @@ public class TunerInputController {
     /**
      * Discovers a network tuner. If the network connection is down, it won't repeatedly checking.
      */
+    @Override
     public void executeNetworkTunerDiscoveryAsyncTask(final Context context) {
         executeNetworkTunerDiscoveryAsyncTask(context, 0, 0);
     }
@@ -459,8 +462,9 @@ public class TunerInputController {
         public void onReceive(Context context, Intent intent) {
             if (DEBUG) Log.d(TAG, "Broadcast intent received:" + intent);
             Starter.start(context);
-            TunerInputController tunerInputController =
-                    TvSingletons.getSingletons(context).getTunerInputController();
+            TunerInputControllerImpl tunerInputController =
+                    (TunerInputControllerImpl)
+                            TvSingletons.getSingletons(context).getTunerInputController();
             if (!TUNER.isEnabled(context)) {
                 tunerInputController.handleTunerStatusChanged(
                         context, false, Collections.emptySet(), null);
@@ -531,10 +535,10 @@ public class TunerInputController {
 
     private static class CheckDvbDeviceHandler extends Handler {
 
-        private final TunerInputController mTunerInputController;
+        private final TunerInputControllerImpl mTunerInputController;
         private DvbDeviceAccessor mDvbDeviceAccessor;
 
-        CheckDvbDeviceHandler(TunerInputController tunerInputController) {
+        CheckDvbDeviceHandler(TunerInputControllerImpl tunerInputController) {
             super(Looper.getMainLooper());
             this.mTunerInputController = tunerInputController;
         }
diff --git a/src/com/android/tv/tunerinputcontroller/TunerInputController.java b/src/com/android/tv/tunerinputcontroller/TunerInputController.java
new file mode 100644
index 00000000..0fe171c3
--- /dev/null
+++ b/src/com/android/tv/tunerinputcontroller/TunerInputController.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.tunerinputcontroller;
+
+import android.content.Context;
+
+/** Controls the package visibility of built in tuner services. */
+public interface TunerInputController {
+
+    void onCheckingUsbTunerStatus(Context context, String action);
+
+    void executeNetworkTunerDiscoveryAsyncTask(Context context);
+}
diff --git a/tests/common/src/com/android/tv/testing/TestSingletonApp.java b/tests/common/src/com/android/tv/testing/TestSingletonApp.java
index b219382c..21aabac6 100644
--- a/tests/common/src/com/android/tv/testing/TestSingletonApp.java
+++ b/tests/common/src/com/android/tv/testing/TestSingletonApp.java
@@ -46,7 +46,8 @@ import com.android.tv.perf.PerformanceMonitor;
 import com.android.tv.perf.stub.StubPerformanceMonitor;
 import com.android.tv.testing.dvr.DvrDataManagerInMemoryImpl;
 import com.android.tv.testing.testdata.TestData;
-import com.android.tv.tuner.TunerInputController;
+import com.android.tv.tuner.TunerInputControllerImpl;
+import com.android.tv.tunerinputcontroller.TunerInputController;
 import com.android.tv.util.SetupUtils;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.account.AccountHelper;
@@ -74,7 +75,7 @@ public class TestSingletonApp extends Application implements TvSingletons {
     public void onCreate() {
         super.onCreate();
         mTunerInputController =
-                new TunerInputController(
+                new TunerInputControllerImpl(
                         ComponentName.unflattenFromString(getEmbeddedTunerInputId()));
 
         tvInputManagerHelper = new FakeTvInputManagerHelper(this);
diff --git a/tests/unit/src/com/android/tv/util/MockTvSingletons.java b/tests/unit/src/com/android/tv/util/MockTvSingletons.java
index 6de1eb3e..655bc90b 100644
--- a/tests/unit/src/com/android/tv/util/MockTvSingletons.java
+++ b/tests/unit/src/com/android/tv/util/MockTvSingletons.java
@@ -40,7 +40,7 @@ import com.android.tv.dvr.DvrWatchedPositionManager;
 import com.android.tv.dvr.recorder.RecordingScheduler;
 import com.android.tv.perf.PerformanceMonitor;
 import com.android.tv.testing.FakeClock;
-import com.android.tv.tuner.TunerInputController;
+import com.android.tv.tunerinputcontroller.TunerInputController;
 import java.util.concurrent.Executor;
 import javax.inject.Provider;