aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2019-10-07 09:34:38 -0700
committerCopybara-Service <copybara-worker@google.com>2019-10-07 19:06:14 -0700
commit75216388bf3ffc827e711705a51cc878f5f675d3 (patch)
treeeaa1fc4491f9c43abff1ab066e5798cc12c759bd /common
parent722abf53e947d695f12cde30ad6db4083ddaded2 (diff)
downloadTV-75216388bf3ffc827e711705a51cc878f5f675d3.tar.gz
Delete ConcurrentDvrPlayback flags
PiperOrigin-RevId: 273309970 Change-Id: If047c9e142b81f6c027b22435be0282bebd12efe
Diffstat (limited to 'common')
-rwxr-xr-xcommon/src/com/android/tv/common/flags/ConcurrentDvrPlaybackFlags.java29
-rw-r--r--common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java27
-rw-r--r--common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java8
-rw-r--r--common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java10
4 files changed, 2 insertions, 72 deletions
diff --git a/common/src/com/android/tv/common/flags/ConcurrentDvrPlaybackFlags.java b/common/src/com/android/tv/common/flags/ConcurrentDvrPlaybackFlags.java
deleted file mode 100755
index e72f5575..00000000
--- a/common/src/com/android/tv/common/flags/ConcurrentDvrPlaybackFlags.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2019 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;
-
-/** Flags allowing concurrent DVR playback */
-public interface ConcurrentDvrPlaybackFlags {
-
- /**
- * Whether or not this feature is compiled into this build.
- *
- * <p>This returns true by default, unless the is_compiled_selector parameter was set during
- * code generation.
- */
- boolean compiled();
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java
deleted file mode 100644
index 90cbb9ff..00000000
--- a/common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java
+++ /dev/null
@@ -1,27 +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.impl;
-
-import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
-
-/** Default flags for Concurrent DVR Playback */
-public final class DefaultConcurrentDvrPlaybackFlags implements ConcurrentDvrPlaybackFlags {
-
- @Override
- public boolean compiled() {
- return true;
- }
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java b/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
index 2aaf4469..10be34b5 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
@@ -18,9 +18,9 @@ package com.android.tv.common.flags.impl;
import dagger.Module;
import dagger.Provides;
import dagger.Reusable;
+
import com.android.tv.common.flags.BackendKnobsFlags;
import com.android.tv.common.flags.CloudEpgFlags;
-import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
import com.android.tv.common.flags.DvrFlags;
import com.android.tv.common.flags.LegacyFlags;
import com.android.tv.common.flags.StartupFlags;
@@ -45,12 +45,6 @@ public class DefaultFlagsModule {
@Provides
@Reusable
- ConcurrentDvrPlaybackFlags provideConcurrentDvrPlaybackFlags() {
- return new DefaultConcurrentDvrPlaybackFlags();
- }
-
- @Provides
- @Reusable
DvrFlags provideDvrFlags() {
return new DefaultDvrFlags();
}
diff --git a/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java b/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java
index b188158c..64e289db 100644
--- a/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java
+++ b/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java
@@ -18,9 +18,9 @@ package com.android.tv.common.flags.impl;
import dagger.Module;
import dagger.Provides;
import dagger.Reusable;
+
import com.android.tv.common.flags.BackendKnobsFlags;
import com.android.tv.common.flags.CloudEpgFlags;
-import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
import com.android.tv.common.flags.DvrFlags;
import com.android.tv.common.flags.LegacyFlags;
import com.android.tv.common.flags.StartupFlags;
@@ -33,8 +33,6 @@ public class SettableFlagsModule {
public DefaultBackendKnobsFlags backendKnobsFlags = new DefaultBackendKnobsFlags();
public DefaultCloudEpgFlags cloudEpgFlags = new DefaultCloudEpgFlags();
- public DefaultConcurrentDvrPlaybackFlags concurrentDvrPlaybackFlags =
- new DefaultConcurrentDvrPlaybackFlags();
public DefaultDvrFlags dvrFlags = new DefaultDvrFlags();
public DefaultLegacyFlags legacyFlags = DefaultLegacyFlags.DEFAULT;
public DefaultStartupFlags startupFlags = new DefaultStartupFlags();
@@ -55,12 +53,6 @@ public class SettableFlagsModule {
@Provides
@Reusable
- ConcurrentDvrPlaybackFlags provideConcurrentDvrPlaybackFlags() {
- return concurrentDvrPlaybackFlags;
- }
-
- @Provides
- @Reusable
DvrFlags provideDvrFlags() {
return dvrFlags;
}