Fix NPE when passing null TvContentRating

Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07

1 files changed, 3 insertions, 0 deletions

diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index f76c78b66044..815ba5208cc0 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -1339,6 +1339,9 @@ public final class TvInputManager {
                 Log.w(TAG, "The session has been already released");
                 return;
             }
+            if (unblockedRating == null) {
+                throw new IllegalArgumentException("unblockedRating cannot be null");
+            }
             try {
                 mService.requestUnblockContent(mToken, unblockedRating.flattenToString(), mUserId);
             } catch (RemoteException e) {