aboutsummaryrefslogtreecommitdiff
path: root/tuner
diff options
context:
space:
mode:
authornchalko <nchalko@google.com>2018-02-27 10:30:41 -0800
committerNick Chalko <nchalko@google.com>2018-03-13 21:02:30 +0000
commit17ccb90dc4b4be6dce693dc3effa975006ee133d (patch)
tree24d45735b0d228c2baa289d0cb01ee01ba3c4c68 /tuner
parent16747f29f825cedc42aa69c42045ad00ef75b00a (diff)
downloadTV-17ccb90dc4b4be6dce693dc3effa975006ee133d.tar.gz
FIX: Tuner should only report a program as unrated if the experiment is turned on.
PiperOrigin-RevId: 187195627 Change-Id: If5a66162f8012f5184b63c6097d4adf5a6f7fe01
Diffstat (limited to 'tuner')
-rw-r--r--tuner/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
index 65750e08..7dfa8b52 100644
--- a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
+++ b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
@@ -47,6 +47,7 @@ import com.android.tv.common.SoftPreconditions;
import com.android.tv.common.TvContentRatingCache;
import com.android.tv.common.customization.CustomizationManager;
import com.android.tv.common.customization.CustomizationManager.TRICKPLAY_MODE;
+import com.android.tv.common.experiments.Experiments;
import com.android.tv.common.util.SystemPropertiesProxy;
import com.android.tv.tuner.TunerPreferences;
import com.android.tv.tuner.data.Cea708Data;
@@ -1795,7 +1796,8 @@ public class TunerSessionWorker
}
TvContentRating[] ratings =
mTvContentRatingCache.getRatings(currentProgram.getContentRating());
- if (ratings == null || ratings.length == 0) {
+ if ((ratings == null || ratings.length == 0)
+ && Experiments.ENABLE_UNRATED_CONTENT_SETTINGS.get()) {
ratings = new TvContentRating[] {TvContentRating.UNRATED};
}
for (TvContentRating rating : ratings) {