diff options
| author | Jaewan Kim <jaewan@google.com> | 2014-08-19 04:52:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:12:14 +0000 |
| commit | 67d666f60422454e64885fecc78c1f5c0a0477e4 (patch) | |
| tree | 278a9e7f30e921a43f9a8176e93905e57b9c5362 /media | |
| parent | 79fc32794cf1258184bc3699041dae2a825e69cf (diff) | |
| parent | a42be3c95021c5fb7e4ac0a8fbfc542f841f44dd (diff) | |
| download | frameworks_base-67d666f60422454e64885fecc78c1f5c0a0477e4.zip frameworks_base-67d666f60422454e64885fecc78c1f5c0a0477e4.tar.gz frameworks_base-67d666f60422454e64885fecc78c1f5c0a0477e4.tar.bz2 | |
Merge "Fix NPE when passing null TvContentRating" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/TvInputManager.java | 3 |
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 f76c78b..815ba52 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) { |