Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev

raphlinus · Android (Google) Code Review · commit 00139b223856 · 2012-07-10T18:05:12.000-07:00
diff --git a/core/java/android/text/MeasuredText.java b/core/java/android/text/MeasuredText.java
@@ -83,7 +83,7 @@ static MeasuredText recycle(MeasuredText mt) {
     }
 
     void setPos(int pos) {
-        mPos = pos;
+        mPos = pos - mTextStart;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static MeasuredText recycle(MeasuredText mt) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`void setPos(int pos) {`
`86`		`- mPos = pos;`
	`86`	`+ mPos = pos - mTextStart;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`