1 files changed, 27 insertions, 5 deletions
diff --git a/src/com/android/tv/ui/sidepanel/parentalcontrols/SubRatingsFragment.java b/src/com/android/tv/ui/sidepanel/parentalcontrols/SubRatingsFragment.java
index f6612fdb..4634b74c 100644
--- a/src/com/android/tv/ui/sidepanel/parentalcontrols/SubRatingsFragment.java
+++ b/src/com/android/tv/ui/sidepanel/parentalcontrols/SubRatingsFragment.java
@@ -17,6 +17,7 @@
 package com.android.tv.ui.sidepanel.parentalcontrols;
 
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
@@ -36,13 +37,34 @@ import java.util.List;
 public class SubRatingsFragment extends SideFragment {
     private static final String TRACKER_LABEL = "Sub ratings";
 
-    private final ContentRatingSystem mContentRatingSystem;
-    private final Rating mRating;
+    private static final String ARGS_CONTENT_RATING_SYSTEM_ID = "args_content_rating_system_id";
+    private static final String ARGS_RATING_NAME = "args_rating_name";
+
+    private ContentRatingSystem mContentRatingSystem;
+    private Rating mRating;
     private final List<SubRatingItem> mSubRatingItems = new ArrayList<>();
 
-    public SubRatingsFragment(ContentRatingSystem contentRatingSystem, Rating rating) {
-        mContentRatingSystem = contentRatingSystem;
-        mRating = rating;
+    public static SubRatingsFragment create(ContentRatingSystem contentRatingSystem,
+            String ratingName) {
+        SubRatingsFragment fragment = new SubRatingsFragment();
+        Bundle args = new Bundle();
+        args.putString(ARGS_CONTENT_RATING_SYSTEM_ID, contentRatingSystem.getId());
+        args.putString(ARGS_RATING_NAME, ratingName);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContentRatingSystem = getMainActivity().getContentRatingsManager()
+                .getContentRatingSystem(getArguments().getString(ARGS_CONTENT_RATING_SYSTEM_ID));
+        if (mContentRatingSystem != null) {
+            mRating = mContentRatingSystem.getRating(getArguments().getString(ARGS_RATING_NAME));
+        }
+        if (mRating == null) {
+            closeFragment();
+        }
     }
 
     @Override