am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev

* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f': Fix NPE when passing null TvContentRating
2014-08-19 05:03:07 +00:00
parent 2a9af92880 67d666f604
commit 8b1b8a302c
1 changed files with 3 additions and 0 deletions
--- 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) {