am 84bee4f: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0

Jeff Brown · Android Git Automerger · commit ce6578acc572 · 2011-10-28T08:20:20.000Z
* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
  Fix copyStringToBuffer row index calculation. Bug: 5515552
diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java
@@ -468,7 +468,7 @@ public void copyStringToBuffer(int row, int column, CharArrayBuffer buffer) {
         }
         acquireReference();
         try {
-            nativeCopyStringToBuffer(mWindowPtr, row, column, buffer);
+            nativeCopyStringToBuffer(mWindowPtr, row - mStartPos, column, buffer);
         } finally {
             releaseReference();
         }

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ public void copyStringToBuffer(int row, int column, CharArrayBuffer buffer) {`
`468`	`468`	`}`
`469`	`469`	`acquireReference();`
`470`	`470`	`try {`
`471`		`- nativeCopyStringToBuffer(mWindowPtr, row, column, buffer);`
	`471`	`+ nativeCopyStringToBuffer(mWindowPtr, row - mStartPos, column, buffer);`
`472`	`472`	`} finally {`
`473`	`473`	`releaseReference();`
`474`	`474`	`}`