From a42be3c95021c5fb7e4ac0a8fbfc542f841f44dd Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Tue, 19 Aug 2014 11:55:07 +0900
Subject: [PATCH] Fix NPE when passing null TvContentRating

Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
---
 media/java/android/media/tv/TvInputManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index f76c78b66044a..815ba5208cc00 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) {