diff options
author | nchalko <nchalko@google.com> | 2019-06-21 14:56:41 -0700 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2019-06-24 05:49:02 -0700 |
commit | 6984b4868c648b9414778250d10b6a8ec10238ce (patch) | |
tree | f56c084b3970420258ca34dc89333a40cdfd7e84 | |
parent | 0386c14e442c4d5eadf4772e9f4f966b296d4170 (diff) | |
download | TV-6984b4868c648b9414778250d10b6a8ec10238ce.tar.gz |
Remove unused HasConcurrentDvrPlaybackFlags interface
PiperOrigin-RevId: 254473872
Change-Id: I503f1cd7d7f562095adc0bb2fab9499075f459f5
7 files changed, 4 insertions, 62 deletions
diff --git a/common/src/com/android/tv/common/BaseSingletons.java b/common/src/com/android/tv/common/BaseSingletons.java index 3c6cff54..8a3820d1 100644 --- a/common/src/com/android/tv/common/BaseSingletons.java +++ b/common/src/com/android/tv/common/BaseSingletons.java @@ -18,13 +18,11 @@ package com.android.tv.common; import com.android.tv.common.buildtype.HasBuildType; import com.android.tv.common.flags.has.HasCloudEpgFlags; -import com.android.tv.common.flags.has.HasConcurrentDvrPlaybackFlags; import com.android.tv.common.recording.RecordingStorageStatusManager; import com.android.tv.common.util.Clock; /** Injection point for the base app */ -public interface BaseSingletons - extends HasCloudEpgFlags, HasBuildType, HasConcurrentDvrPlaybackFlags { +public interface BaseSingletons extends HasCloudEpgFlags, HasBuildType { /* * Do not add any new methods here. diff --git a/common/src/com/android/tv/common/flags/has/HasConcurrentDvrPlaybackFlags.java b/common/src/com/android/tv/common/flags/has/HasConcurrentDvrPlaybackFlags.java deleted file mode 100644 index b4710875..00000000 --- a/common/src/com/android/tv/common/flags/has/HasConcurrentDvrPlaybackFlags.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.common.flags.has; - -import android.content.Context; -import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags; - -/** Has {@link ConcurrentDvrPlaybackFlags} */ -public interface HasConcurrentDvrPlaybackFlags { - - static ConcurrentDvrPlaybackFlags fromContext(Context context) { - return ((HasConcurrentDvrPlaybackFlags) HasUtils.getApplicationContext(context)) - .getConcurrentDvrPlaybackFlags(); - } - - ConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags(); -} diff --git a/src/com/android/tv/app/LiveTvApplication.java b/src/com/android/tv/app/LiveTvApplication.java index ac178e53..80906537 100644 --- a/src/com/android/tv/app/LiveTvApplication.java +++ b/src/com/android/tv/app/LiveTvApplication.java @@ -24,7 +24,6 @@ import com.android.tv.analytics.Tracker; import com.android.tv.common.dagger.ApplicationModule; import com.android.tv.common.flags.impl.DefaultBackendKnobsFlags; import com.android.tv.common.flags.impl.DefaultCloudEpgFlags; -import com.android.tv.common.flags.impl.DefaultConcurrentDvrPlaybackFlags; import com.android.tv.common.flags.impl.DefaultUiFlags; import com.android.tv.common.singletons.HasSingletons; import com.android.tv.modules.TvSingletonsModule; @@ -47,8 +46,7 @@ public class LiveTvApplication extends TvApplication implements HasSingletons<Tv private final DefaultBackendKnobsFlags mBackendKnobsFlags = new DefaultBackendKnobsFlags(); private final DefaultCloudEpgFlags mCloudEpgFlags = new DefaultCloudEpgFlags(); private final DefaultUiFlags mUiFlags = new DefaultUiFlags(); - private final DefaultConcurrentDvrPlaybackFlags mConcurrentDvrPlaybackFlags = - new DefaultConcurrentDvrPlaybackFlags(); + private Analytics mAnalytics; private Tracker mTracker; @Inject PerformanceMonitor mPerformanceMonitor; @@ -111,11 +109,6 @@ public class LiveTvApplication extends TvApplication implements HasSingletons<Tv } @Override - public DefaultConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags() { - return mConcurrentDvrPlaybackFlags; - } - - @Override public TvSingletons singletons() { return this; } diff --git a/tests/common/src/com/android/tv/testing/TestSingletonApp.java b/tests/common/src/com/android/tv/testing/TestSingletonApp.java index 7698286c..e233d95d 100644 --- a/tests/common/src/com/android/tv/testing/TestSingletonApp.java +++ b/tests/common/src/com/android/tv/testing/TestSingletonApp.java @@ -28,7 +28,6 @@ import com.android.tv.analytics.Tracker; import com.android.tv.common.BaseApplication; import com.android.tv.common.flags.impl.DefaultBackendKnobsFlags; import com.android.tv.common.flags.impl.DefaultCloudEpgFlags; -import com.android.tv.common.flags.impl.DefaultConcurrentDvrPlaybackFlags; import com.android.tv.common.flags.impl.DefaultUiFlags; import com.android.tv.common.flags.impl.SettableFlagsModule; import com.android.tv.common.recording.RecordingStorageStatusManager; @@ -236,11 +235,6 @@ public class TestSingletonApp extends Application } @Override - public DefaultConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags() { - return flagsModule.concurrentDvrPlaybackFlags; - } - - @Override public TvSingletons singletons() { return this; } diff --git a/tests/unit/src/com/android/tv/util/MockTvSingletons.java b/tests/unit/src/com/android/tv/util/MockTvSingletons.java index 85840e91..d9ff5e71 100644 --- a/tests/unit/src/com/android/tv/util/MockTvSingletons.java +++ b/tests/unit/src/com/android/tv/util/MockTvSingletons.java @@ -26,7 +26,6 @@ import com.android.tv.analytics.Analytics; import com.android.tv.analytics.Tracker; import com.android.tv.common.flags.impl.DefaultBackendKnobsFlags; import com.android.tv.common.flags.impl.DefaultCloudEpgFlags; -import com.android.tv.common.flags.impl.DefaultConcurrentDvrPlaybackFlags; import com.android.tv.common.flags.impl.DefaultUiFlags; import com.android.tv.common.recording.RecordingStorageStatusManager; import com.android.tv.common.singletons.HasSingletons; @@ -58,8 +57,6 @@ public class MockTvSingletons implements TvSingletons, HasSingletons<TvSingleton private final DefaultBackendKnobsFlags mBackendFlags = new DefaultBackendKnobsFlags(); private final DefaultCloudEpgFlags mCloudEpgFlags = new DefaultCloudEpgFlags(); private final DefaultUiFlags mUiFlags = new DefaultUiFlags(); - private final DefaultConcurrentDvrPlaybackFlags mConcurrentDvrPlaybackFlags = - new DefaultConcurrentDvrPlaybackFlags(); private PerformanceMonitor mPerformanceMonitor; public MockTvSingletons(Context context) { @@ -199,11 +196,6 @@ public class MockTvSingletons implements TvSingletons, HasSingletons<TvSingleton } @Override - public DefaultConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags() { - return mConcurrentDvrPlaybackFlags; - } - - @Override public TvSingletons singletons() { return this; } diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java index 8cdd6efc..c45bb271 100644 --- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java +++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java @@ -75,11 +75,6 @@ public class SampleDvbTuner extends BaseApplication } @Override - public ConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags() { - return mConcurrentDvrPlaybackFlags; - } - - @Override public SampleDvbSingletons singletons() { return this; } diff --git a/tuner/src/com/android/tv/tuner/setup/ScanFragment.java b/tuner/src/com/android/tv/tuner/setup/ScanFragment.java index 3c385152..2ac28bc7 100644 --- a/tuner/src/com/android/tv/tuner/setup/ScanFragment.java +++ b/tuner/src/com/android/tv/tuner/setup/ScanFragment.java @@ -43,8 +43,8 @@ import com.android.tv.tuner.api.Tuner; import com.android.tv.tuner.data.Channel.TunerType; import com.android.tv.tuner.data.PsipData; import com.android.tv.tuner.data.TunerChannel; - - +import com.android.tv.tuner.network.NetworkChannelScan; +import com.android.tv.tuner.network.NetworkTunerHal; import com.android.tv.tuner.prefs.TunerPreferences; import com.android.tv.tuner.source.FileTsStreamer; import com.android.tv.tuner.source.TsDataSource; |