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

* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
  Fix copyStringToBuffer row index calculation. Bug: 5515552

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java
index 9c933247f6f6..31e6f02c371e 100644
--- a/core/java/android/database/CursorWindow.java
+++ b/core/java/android/database/CursorWindow.java
@@ -468,7 +468,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
         }
         acquireReference();
         try {
-            nativeCopyStringToBuffer(mWindowPtr, row, column, buffer);
+            nativeCopyStringToBuffer(mWindowPtr, row - mStartPos, column, buffer);
         } finally {
             releaseReference();
         }