diff options
| author | nchalko <nchalko@google.com> | 2018-12-26 09:57:39 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2019-01-16 20:40:38 +0000 |
| commit | 29fb128f3434d80989eaace9e6e99ed3763a0742 (patch) | |
| tree | 9933b20923f5e0955d8fd558ea1d29303f85f638 /tests | |
| parent | e462b7eab22efd7a9fa1273076fd94217fe67b6a (diff) | |
| download | TV-29fb128f3434d80989eaace9e6e99ed3763a0742.tar.gz | |
Remove GservicesFeature
The only use was to always unhide live channels on a Nexus Player with
a SDK > O
PiperOrigin-RevId: 226928216
Change-Id: Ifa949934c64b1ba17c23450a48fd471973cd60b4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/common/src/com/android/tv/testing/TestSingletonApp.java | 7 | ||||
| -rw-r--r-- | tests/unit/src/com/android/tv/util/MockTvSingletons.java | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/common/src/com/android/tv/testing/TestSingletonApp.java b/tests/common/src/com/android/tv/testing/TestSingletonApp.java index 61e730c0..e1601dc8 100644 --- a/tests/common/src/com/android/tv/testing/TestSingletonApp.java +++ b/tests/common/src/com/android/tv/testing/TestSingletonApp.java @@ -32,6 +32,7 @@ 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.DefaultExoplayer2Flags; +import com.android.tv.common.flags.impl.DefaultUiFlags; import com.android.tv.common.recording.RecordingStorageStatusManager; import com.android.tv.common.singletons.HasSingletons; import com.android.tv.common.util.Clock; @@ -80,6 +81,7 @@ public class TestSingletonApp extends Application private final Optional<BuiltInTunerManager> mBuiltInTunerManagerOptional = Optional.absent(); private final DefaultBackendKnobsFlags mBackendKnobs = new DefaultBackendKnobsFlags(); private final DefaultCloudEpgFlags mCloudEpgFlags = new DefaultCloudEpgFlags(); + private final DefaultUiFlags mUiFlags = new DefaultUiFlags(); private final DefaultConcurrentDvrPlaybackFlags mConcurrentDvrPlaybackFlags = new DefaultConcurrentDvrPlaybackFlags(); private final TunerSessionFactoryImpl mTunerSessionFactory = @@ -264,6 +266,11 @@ public class TestSingletonApp extends Application } @Override + public DefaultUiFlags getUiFlags() { + return mUiFlags; + } + + @Override public BuildType getBuildType() { return BuildType.ENG; } diff --git a/tests/unit/src/com/android/tv/util/MockTvSingletons.java b/tests/unit/src/com/android/tv/util/MockTvSingletons.java index 4837c407..534be837 100644 --- a/tests/unit/src/com/android/tv/util/MockTvSingletons.java +++ b/tests/unit/src/com/android/tv/util/MockTvSingletons.java @@ -28,6 +28,7 @@ import com.android.tv.common.experiments.ExperimentLoader; 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; import com.android.tv.common.util.Clock; @@ -55,6 +56,7 @@ public class MockTvSingletons implements TvSingletons, HasSingletons<TvSingleton private final TvApplication mApp; 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; @@ -206,6 +208,11 @@ public class MockTvSingletons implements TvSingletons, HasSingletons<TvSingleton } @Override + public DefaultUiFlags getUiFlags() { + return mUiFlags; + } + + @Override public Executor getDbExecutor() { return mApp.getDbExecutor(); } |