diff options
| author | nchalko <nchalko@google.com> | 2019-02-08 12:14:29 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2019-02-12 22:23:14 -0800 |
| commit | 99c33e07d72dbd3592c9703f63008d0b94596ea2 (patch) | |
| tree | 7496f36dc3dda86887359c7f1f7b3adbf4d0f43a /common | |
| parent | 1d54a3ab6f70cb78c2df02c19e4037a5c9cbef8f (diff) | |
| download | TV-99c33e07d72dbd3592c9703f63008d0b94596ea2.tar.gz | |
Retire launched CloudEpg flag.
PiperOrigin-RevId: 233103924
Change-Id: I64fabb091de9914f53f059089cb9549b799679b5
Diffstat (limited to 'common')
| -rw-r--r-- | common/src/com/android/tv/common/experiments/Experiments.java | 5 | ||||
| -rw-r--r-- | common/src/com/android/tv/common/feature/CommonFeatures.java | 38 |
2 files changed, 17 insertions, 26 deletions
diff --git a/common/src/com/android/tv/common/experiments/Experiments.java b/common/src/com/android/tv/common/experiments/Experiments.java index 6dfa46b8..9bfdb547 100644 --- a/common/src/com/android/tv/common/experiments/Experiments.java +++ b/common/src/com/android/tv/common/experiments/Experiments.java @@ -27,11 +27,6 @@ import com.android.tv.common.BuildConfig; * <p>This file is maintained by hand. */ public final class Experiments { - public static final ExperimentFlag<Boolean> CLOUD_EPG = - ExperimentFlag.createFlag( -// AOSP_Comment_Out LiveChannels::enableCloudEpg, - true); - public static final ExperimentFlag<Boolean> ENABLE_UNRATED_CONTENT_SETTINGS = ExperimentFlag.createFlag( // AOSP_Comment_Out LiveChannels::enableUnratedContentSettings, diff --git a/common/src/com/android/tv/common/feature/CommonFeatures.java b/common/src/com/android/tv/common/feature/CommonFeatures.java index bccb9e14..04052a7c 100644 --- a/common/src/com/android/tv/common/feature/CommonFeatures.java +++ b/common/src/com/android/tv/common/feature/CommonFeatures.java @@ -23,7 +23,6 @@ import static com.android.tv.common.feature.TestableFeature.createTestableFeatur import android.content.Context; import android.util.Log; -import com.android.tv.common.experiments.Experiments; import com.android.tv.common.flags.has.HasCloudEpgFlags; import com.android.tv.common.util.LocationUtils; import com.android.tv.common.flags.CloudEpgFlags; @@ -57,28 +56,25 @@ public class CommonFeatures { /** Show postal code fragment before channel scan. */ public static final Feature ENABLE_CLOUD_EPG_REGION = - and( - ExperimentFeature.from(Experiments.CLOUD_EPG), - or( - FlagFeature.from( - HasCloudEpgFlags::fromContext, CloudEpgFlags::supportedRegion), - new Feature() { - private final String[] supportedRegions = { -// AOSP_Comment_Out "US", "GB" - }; + or( + FlagFeature.from(HasCloudEpgFlags::fromContext, CloudEpgFlags::supportedRegion), + new Feature() { + private final String[] supportedRegions = { +// AOSP_Comment_Out "US", "GB" + }; - @Override - public boolean isEnabled(Context context) { - String country = LocationUtils.getCurrentCountry(context); - for (int i = 0; i < supportedRegions.length; i++) { - if (supportedRegions[i].equalsIgnoreCase(country)) { - return true; - } - } - if (DEBUG) Log.d(TAG, "EPG flag false after country check"); - return false; + @Override + public boolean isEnabled(Context context) { + String country = LocationUtils.getCurrentCountry(context); + for (int i = 0; i < supportedRegions.length; i++) { + if (supportedRegions[i].equalsIgnoreCase(country)) { + return true; } - })); + } + if (DEBUG) Log.d(TAG, "EPG flag false after country check"); + return false; + } + }); // TODO(b/74197177): remove when UI and API finalized. /** Show channel signal strength. */ |