merge from open-source master

The Android Open Source Project · The Android Open Source Project · commit e5a023bfbbed · 2010-06-18T12:40:42.000-07:00
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java
@@ -204,7 +204,7 @@ public final boolean moveToPosition(int position) {
      * @param window
      */
     public void fillWindow(int position, CursorWindow window) {
-        if (position < 0 || position > getCount()) {
+        if (position < 0 || position >= getCount()) {
             return;
         }
         window.acquireReference();

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public final boolean moveToPosition(int position) {`
`204`	`204`	`* @param window`
`205`	`205`	`*/`
`206`	`206`	`public void fillWindow(int position, CursorWindow window) {`
`207`		`- if (position < 0 \|\| position > getCount()) {`
	`207`	`+ if (position < 0 \|\| position >= getCount()) {`
`208`	`208`	`return;`
`209`	`209`	`}`
`210`	`210`	`window.acquireReference();`