1 files changed, 12 insertions, 16 deletions

diff --git a/src/com/android/tv/parental/ContentRatingsManager.java b/src/com/android/tv/parental/ContentRatingsManager.java
index c3bb8c0f..32a1325b 100644
--- a/src/com/android/tv/parental/ContentRatingsManager.java
+++ b/src/com/android/tv/parental/ContentRatingsManager.java
@@ -19,14 +19,12 @@ package com.android.tv.parental;
 import android.content.Context;
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContentRatingSystemInfo;
-import android.media.tv.TvInputManager;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-
 import com.android.tv.R;
 import com.android.tv.parental.ContentRatingSystem.Rating;
 import com.android.tv.parental.ContentRatingSystem.SubRating;
-
+import com.android.tv.util.TvInputManagerHelper;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,19 +32,19 @@ public class ContentRatingsManager {
     private final List<ContentRatingSystem> mContentRatingSystems = new ArrayList<>();
 
     private final Context mContext;
+    private final TvInputManagerHelper.TvInputManagerInterface mTvInputManager;
 
-    public ContentRatingsManager(Context context) {
+    public ContentRatingsManager(
+            Context context, TvInputManagerHelper.TvInputManagerInterface tvInputManager) {
         mContext = context;
+        this.mTvInputManager = tvInputManager;
     }
 
     public void update() {
         mContentRatingSystems.clear();
-
-        TvInputManager manager =
-                (TvInputManager) mContext.getSystemService(Context.TV_INPUT_SERVICE);
         ContentRatingsParser parser = new ContentRatingsParser(mContext);
 
-        List<TvContentRatingSystemInfo> infos = manager.getTvContentRatingSystemList();
+        List<TvContentRatingSystemInfo> infos = mTvInputManager.getTvContentRatingSystemList();
         for (TvContentRatingSystemInfo info : infos) {
             List<ContentRatingSystem> list = parser.parse(info);
             if (list != null) {
@@ -55,9 +53,7 @@ public class ContentRatingsManager {
         }
     }
 
-    /**
-     * Returns the content rating system with the give ID.
-     */
+    /** Returns the content rating system with the give ID. */
     @Nullable
     public ContentRatingSystem getContentRatingSystem(String contentRatingSystemId) {
         for (ContentRatingSystem ratingSystem : mContentRatingSystems) {
@@ -68,9 +64,7 @@ public class ContentRatingsManager {
         return null;
     }
 
-    /**
-     * Returns a new list of all content rating systems defined.
-     */
+    /** Returns a new list of all content rating systems defined. */
     public List<ContentRatingSystem> getContentRatingSystems() {
         return new ArrayList<>(mContentRatingSystems);
     }
@@ -118,8 +112,10 @@ public class ContentRatingsManager {
 
     private List<SubRating> getSubRatings(Rating rating, TvContentRating canonicalRating) {
         List<SubRating> subRatings = new ArrayList<>();
-        if (rating == null || rating.getSubRatings() == null
-                || canonicalRating == null || canonicalRating.getSubRatings() == null) {
+        if (rating == null
+                || rating.getSubRatings() == null
+                || canonicalRating == null
+                || canonicalRating.getSubRatings() == null) {
             return subRatings;
         }
         for (String subRatingString : canonicalRating.getSubRatings()) {