summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-02-06 02:06:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-06 02:06:24 +0000
commit6cad6513e0058467d11f4cf99519cf79eb65d48f (patch)
tree15b4c83be1649db22800d00739f7ccd24b885533 /media/java
parent9a166c7da3d77c4b9801dbe249f78149649d5b0e (diff)
parent6286f8ec05ff213f52169a6828aaae3ffd1f20ca (diff)
downloadframeworks_base-6cad6513e0058467d11f4cf99519cf79eb65d48f.zip
frameworks_base-6cad6513e0058467d11f4cf99519cf79eb65d48f.tar.gz
frameworks_base-6cad6513e0058467d11f4cf99519cf79eb65d48f.tar.bz2
Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/ClosedCaptionRenderer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/ClosedCaptionRenderer.java b/media/java/android/media/ClosedCaptionRenderer.java
index ec33c5c..d34b21b 100644
--- a/media/java/android/media/ClosedCaptionRenderer.java
+++ b/media/java/android/media/ClosedCaptionRenderer.java
@@ -666,7 +666,7 @@ class CCParser {
if (pac.isIndentPAC()) {
moveCursorTo(pac.getRow(), pac.getCol());
} else {
- moveCursorToRow(pac.getRow());
+ moveCursorTo(pac.getRow(), 1);
}
getLineBuffer(mRow).setPACAt(mCol, pac);
}