commit 8e136f85f761fe6a31f45a2594405a2d6143716f
author Fabrice Di Meglio <fdimeglio@google.com> Tue Jul 10 14:30:45 2012 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue Jul 10 14:30:45 2012 -0700
tree e020743fd08328e6139fca289bbdcc0d3f1d09f3
parent 1ab2edbcff94d53856a87010e35ffa50ce4c0502

Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE

The mPos field in the MeasuredText object is relative to the start of
the text (mTextStart), but the pos passed in by the caller of the
setPos() method is relative to the character sequence. When spans
overlap break boundaries and the paragraph doesn't start at 0, the
result is an out of bounds error. This fix uses the correct offset.

Change-Id: I64ef06df0eb06f75aedd25de97e9f347eeb52979

core/java/android/text/MeasuredText.java

diff --git a/core/java/android/text/MeasuredText.java b/core/java/android/text/MeasuredText.java
index 445aac63..bd9310c1 100644
--- a/core/java/android/text/MeasuredText.java
+++ b/core/java/android/text/MeasuredText.java
@@ -83,7 +83,7 @@
     }
 
     void setPos(int pos) {
-        mPos = pos;
+        mPos = pos - mTextStart;
     }
 
     /**