commit | a42be3c95021c5fb7e4ac0a8fbfc542f841f44dd | [log] [tgz] |
---|---|---|
author | Jaewan Kim <jaewan@google.com> | Tue Aug 19 11:55:07 2014 +0900 |
committer | Jaewan Kim <jaewan@google.com> | Tue Aug 19 11:55:07 2014 +0900 |
tree | 2fcd31af1df15f5c65003365e60b84c31944f2c2 | |
parent | 3b57e1d1294096f374e11e2ac3aa33098efeb3c4 [diff] |
Fix NPE when passing null TvContentRating Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index f76c78b..815ba52 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java
@@ -1339,6 +1339,9 @@ 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) {