diff options
| author | nchalko <nchalko@google.com> | 2018-07-16 13:04:15 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-07-16 13:04:49 -0700 |
| commit | 1125baf33cb3d3ae1e54e0ccf82147ae525cbe9b (patch) | |
| tree | 2685779fada54236940c249abc5ca8ddd0db7e64 | |
| parent | 64e08fb8abbeed5932ee6d8b7836a23a4121be30 (diff) | |
| download | TV-1125baf33cb3d3ae1e54e0ccf82147ae525cbe9b.tar.gz | |
CLEANUP: Add updateTunerInputInfo to TunerInputController
This breaks the dependency from the core TV library on tuner
PiperOrigin-RevId: 204792329
Change-Id: Ia1a344a2d720f51020b431818f399b887d9eeeca
| -rw-r--r-- | src/com/android/tv/TvApplication.java | 13 | ||||
| -rw-r--r-- | src/com/android/tv/tunerinputcontroller/TunerInputController.java | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java index 1e52bebb..331b4b96 100644 --- a/src/com/android/tv/TvApplication.java +++ b/src/com/android/tv/TvApplication.java @@ -60,7 +60,6 @@ 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.util.TunerInputInfoUtils; import com.android.tv.tunerinputcontroller.TunerInputController; import com.android.tv.util.SetupUtils; import com.android.tv.util.TvInputManagerHelper; @@ -172,11 +171,13 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet new TvInputCallback() { @Override public void onInputAdded(String inputId) { - if (TvFeatures.TUNER.isEnabled(TvApplication.this) + if (getTunerInputController().isPresent() + && TvFeatures.TUNER.isEnabled(TvApplication.this) && TextUtils.equals( inputId, getEmbeddedTunerInputId())) { - TunerInputInfoUtils.updateTunerInputInfo( - TvApplication.this); + getTunerInputController() + .get() + .updateTunerInputInfo(TvApplication.this); } handleInputCountChanged(); } @@ -186,10 +187,10 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet handleInputCountChanged(); } }); - if (TvFeatures.TUNER.isEnabled(this)) { + if (getTunerInputController().isPresent() && TvFeatures.TUNER.isEnabled(this)) { // If the tuner input service is added before the app is started, we need to // handle it here. - TunerInputInfoUtils.updateTunerInputInfo(TvApplication.this); + getTunerInputController().get().updateTunerInputInfo(TvApplication.this); } if (CommonFeatures.DVR.isEnabled(this)) { mDvrScheduleManager = new DvrScheduleManager(this); diff --git a/src/com/android/tv/tunerinputcontroller/TunerInputController.java b/src/com/android/tv/tunerinputcontroller/TunerInputController.java index 0fe171c3..6c3df1c3 100644 --- a/src/com/android/tv/tunerinputcontroller/TunerInputController.java +++ b/src/com/android/tv/tunerinputcontroller/TunerInputController.java @@ -24,4 +24,11 @@ public interface TunerInputController { void onCheckingUsbTunerStatus(Context context, String action); void executeNetworkTunerDiscoveryAsyncTask(Context context); + + /** + * Updates tuner input's info. + * + * @param context {@link Context} instance + */ + void updateTunerInputInfo(Context context); } |