diff options
| author | Manikanta Sivapala <msivap@codeaurora.org> | 2015-05-04 20:32:38 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:28:41 -0600 |
| commit | 1f49807dca63fc24398699589ddd48c824f6cc2e (patch) | |
| tree | 4fc27235b9884dd8b04c09948a3a74887aad6a2f /media | |
| parent | b0765b238c30d69ab492716480e9cb83c3aa45b9 (diff) | |
| download | frameworks_base-1f49807dca63fc24398699589ddd48c824f6cc2e.zip frameworks_base-1f49807dca63fc24398699589ddd48c824f6cc2e.tar.gz frameworks_base-1f49807dca63fc24398699589ddd48c824f6cc2e.tar.bz2 | |
framworks: fix for handling 0x24 ctrl set for CEA rendering
Handling excpetion for 0x24 ctrl command
Change-Id: I8d22f34923842d01cb3bf483b3e31f39ea0dcb48
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/ClosedCaptionRenderer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/ClosedCaptionRenderer.java b/media/java/android/media/ClosedCaptionRenderer.java index 8403c1c..2cf754e 100644 --- a/media/java/android/media/ClosedCaptionRenderer.java +++ b/media/java/android/media/ClosedCaptionRenderer.java @@ -609,8 +609,10 @@ class CCParser { if (mLines[mRow] != null) { for (int i = 0; i < mCol; i++) { if (mLines[mRow].charAt(i) != TS) { - for (int j = mCol; j < mLines[mRow].length(); j++) { - mLines[j].setCharAt(j, TS); + for (int j = mCol; j < mLines[mRow].length() && j < mLines.length; j++) { + if (mLines[j] != null){ + mLines[j].setCharAt(j, TS); + } } return; } |