diff options
author | Chong Zhang <chz@google.com> | 2015-02-06 02:12:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 02:12:16 +0000 |
commit | eceae03f6a21b36baddabe4ca5a2c1d9d238240a (patch) | |
tree | 4edebb4dbfdc74c3fc1daec8b25a7557d3991a67 | |
parent | 80b381c0736c1af43801b8ed26428abdf4d437b3 (diff) | |
parent | 6cad6513e0058467d11f4cf99519cf79eb65d48f (diff) | |
download | frameworks_base-eceae03f6a21b36baddabe4ca5a2c1d9d238240a.zip frameworks_base-eceae03f6a21b36baddabe4ca5a2c1d9d238240a.tar.gz frameworks_base-eceae03f6a21b36baddabe4ca5a2c1d9d238240a.tar.bz2 |
am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
* commit '6cad6513e0058467d11f4cf99519cf79eb65d48f':
reset col position to 1 on row PAC
-rw-r--r-- | media/java/android/media/ClosedCaptionRenderer.java | 2 |
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); } |