diff options
| author | nchalko <nchalko@google.com> | 2019-01-04 15:12:52 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2019-02-12 22:08:13 -0800 |
| commit | ef917ae9fcd0b2b6efa84cfb4a32af02eac29050 (patch) | |
| tree | ce519459e2b2157a9adfd284b9b3aa9f63e21964 | |
| parent | 69be947e5b95435ac1f21418be888451ea1f541c (diff) | |
| download | TV-ef917ae9fcd0b2b6efa84cfb4a32af02eac29050.tar.gz | |
Remove tuner from LiveTv
PiperOrigin-RevId: 227921514
Change-Id: I5c0a335107d7b244ce0d0e5e2404f829d922d866
| -rw-r--r-- | AndroidManifest.xml | 25 | ||||
| -rw-r--r-- | src/com/android/tv/app/LiveTvModule.java | 3 |
2 files changed, 1 insertions, 27 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 50db5536..170be8b9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -78,17 +78,6 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/Theme.TV" > - <activity - android:name="com.android.tv.tuner.setup.LiveTvTunerSetupActivity" - android:configChanges="keyboard|keyboardHidden" - android:label="@string/bt_app_name" - android:launchMode="singleInstance" - android:process="com.android.tv.tuner" - android:theme="@style/Theme.Setup.GuidedStep" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity> <!-- providers are listed here to keep them separate from the internal versions --> <provider @@ -308,20 +297,6 @@ <service android:name="com.android.tv.data.epg.EpgFetchService" android:permission="android.permission.BIND_JOB_SERVICE" /> - <service - android:name="com.android.tv.tuner.livetuner.LiveTvTunerTvInputService" - android:enabled="false" - android:label="@string/bt_app_name" - android:permission="android.permission.BIND_TV_INPUT" - android:process="com.android.tv.tuner" > - <intent-filter> - <action android:name="android.media.tv.TvInputService" /> - </intent-filter> - - <meta-data - android:name="android.media.tv.input" - android:resource="@xml/ut_tvinputservice" /> - </service> </application> </manifest>
\ No newline at end of file diff --git a/src/com/android/tv/app/LiveTvModule.java b/src/com/android/tv/app/LiveTvModule.java index b821379d..aed1ce8c 100644 --- a/src/com/android/tv/app/LiveTvModule.java +++ b/src/com/android/tv/app/LiveTvModule.java @@ -16,14 +16,13 @@ package com.android.tv.app; import com.android.tv.modules.TvApplicationModule; -import com.android.tv.tuner.setup.LiveTvTunerSetupActivity; import com.android.tv.tunerinputcontroller.BuiltInTunerManager; import com.google.common.base.Optional; import dagger.Module; import dagger.Provides; /** Dagger module for {@link LiveTvApplication}. */ -@Module(includes = {TvApplicationModule.class, LiveTvTunerSetupActivity.Module.class}) +@Module(includes = {TvApplicationModule.class}) class LiveTvModule { @Provides |