1 files changed, 17 insertions, 6 deletions

diff --git a/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java b/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
index d1ae4423..064f86f1 100644
--- a/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
+++ b/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.tv.ui.sidepanel.parentalcontrols;
 
+import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.media.tv.TvContentRating;
 import android.os.Bundle;
@@ -26,7 +27,6 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import com.android.tv.MainActivity;
 import com.android.tv.R;
-import com.android.tv.common.experiments.Experiments;
 import com.android.tv.dialog.WebDialogFragment;
 import com.android.tv.license.LicenseUtils;
 import com.android.tv.parental.ContentRatingSystem;
@@ -40,10 +40,13 @@ import com.android.tv.ui.sidepanel.SideFragment;
 import com.android.tv.util.TvSettings;
 import com.android.tv.util.TvSettings.ContentRatingLevel;
 import com.google.common.collect.ImmutableList;
+import dagger.android.AndroidInjection;
+import com.android.tv.common.flags.LegacyFlags;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import javax.inject.Inject;
 
 public class RatingsFragment extends SideFragment {
     private static final SparseIntArray sLevelResourceIdMap;
@@ -51,6 +54,8 @@ public class RatingsFragment extends SideFragment {
     private static final String TRACKER_LABEL = "Ratings";
     private int mItemsSize;
 
+    @Inject LegacyFlags mLegacyFlags;
+
     static {
         sLevelResourceIdMap = new SparseIntArray(5);
         sLevelResourceIdMap.put(TvSettings.CONTENT_RATING_LEVEL_NONE, R.string.option_rating_none);
@@ -101,8 +106,7 @@ public class RatingsFragment extends SideFragment {
     protected List<Item> getItemList() {
         List<Item> items = new ArrayList<>();
 
-        if (mBlockUnratedItem != null
-                && Boolean.TRUE.equals(Experiments.ENABLE_UNRATED_CONTENT_SETTINGS.get())) {
+        if (mBlockUnratedItem != null && mLegacyFlags.enableUnratedContentSettings()) {
             items.add(mBlockUnratedItem);
             items.add(new DividerItem());
         }
@@ -158,7 +162,13 @@ public class RatingsFragment extends SideFragment {
         super.onCreate(savedInstanceState);
         mParentalControlSettings = getMainActivity().getParentalControlSettings();
         mParentalControlSettings.loadRatings();
-        if (Boolean.TRUE.equals(Experiments.ENABLE_UNRATED_CONTENT_SETTINGS.get())) {
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        AndroidInjection.inject(this);
+        super.onAttach(context);
+        if (mLegacyFlags.enableUnratedContentSettings()) {
             mBlockUnratedItem =
                     new CheckBoxItem(
                             getResources().getString(R.string.option_block_unrated_programs)) {
@@ -179,6 +189,8 @@ public class RatingsFragment extends SideFragment {
                             }
                         }
                     };
+        } else {
+            mBlockUnratedItem = null;
         }
     }
 
@@ -235,8 +247,7 @@ public class RatingsFragment extends SideFragment {
             super.onSelected();
             mParentalControlSettings.setContentRatingLevel(
                     getMainActivity().getContentRatingsManager(), mRatingLevel);
-            if (mBlockUnratedItem != null
-                    && Boolean.TRUE.equals(Experiments.ENABLE_UNRATED_CONTENT_SETTINGS.get())) {
+            if (mBlockUnratedItem != null && mLegacyFlags.enableUnratedContentSettings()) {
                 // set checked if UNRATED is blocked, and set unchecked otherwise.
                 mBlockUnratedItem.setChecked(
                         mParentalControlSettings.isRatingBlocked(