diff options
| author | Live Channels Team <no-reply@google.com> | 2018-01-22 16:53:16 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-01-23 15:54:51 +0000 |
| commit | a1589bd48e05abbee991e0cdd27fa402a5dc5001 (patch) | |
| tree | dc016fe932e3b6104b468f7b83025b8baf5e26c6 /src/com/android/tv/app | |
| parent | 4885245cec64d3ef82e502d69ed873fa0760b5fb (diff) | |
| download | TV-a1589bd48e05abbee991e0cdd27fa402a5dc5001.tar.gz | |
Set the target sdk to 26.
Use AtomicInteger instead of volatile.
Create BASE_PACKAGE to explicitly handle the com.android.tv package
which is different than the Live Channels package name com.google.android.tv
Project import generated by Copybara.
PiperOrigin-RevId: 182859017
Change-Id: Ie4bcd0973848f235a40db0586f9a2dcca1198a21
Diffstat (limited to 'src/com/android/tv/app')
| -rw-r--r-- | src/com/android/tv/app/LiveTvApplication.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tv/app/LiveTvApplication.java b/src/com/android/tv/app/LiveTvApplication.java index 1c4f1522..f6ac2441 100644 --- a/src/com/android/tv/app/LiveTvApplication.java +++ b/src/com/android/tv/app/LiveTvApplication.java @@ -20,7 +20,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.media.tv.TvContract; -import com.android.tv.tuner.tvinput.LiveTvTunerTvInputService; import com.android.tv.TvApplication; import com.android.tv.analytics.Analytics; import com.android.tv.analytics.StubAnalytics; @@ -34,6 +33,7 @@ import com.android.tv.data.epg.EpgReader; import com.android.tv.data.epg.StubEpgReader; import com.android.tv.perf.PerformanceMonitor; import com.android.tv.perf.StubPerformanceMonitor; +import com.android.tv.tuner.livetuner.LiveTvTunerTvInputService; import com.android.tv.tuner.setup.LiveTvTunerSetupActivity; import com.android.tv.util.account.AccountHelper; import com.android.tv.util.account.AccountHelperImpl; @@ -41,7 +41,8 @@ import javax.inject.Provider; /** The top level application for Live TV. */ public class LiveTvApplication extends TvApplication { - protected static final String TV_ACTIVITY_CLASS_NAME = "com.android.tv.TvActivity"; + protected static final String TV_ACTIVITY_CLASS_NAME = + CommonConstants.BASE_PACKAGE + ".TvActivity"; private final StubPerformanceMonitor performanceMonitor = new StubPerformanceMonitor(); private final Provider<EpgReader> mEpgReaderProvider = |