diff options
-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; } |