Merge "Terminate loop properly when cursor window is full." into mnc-dev

2015-06-01 23:34:24 +00:00
parent c45d6c30a5 bb8c841e90
commit 0505f7f2b5
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/database/DatabaseUtils.java
+++ b/core/java/android/database/DatabaseUtils.java
@@ -270,7 +270,7 @@ public class DatabaseUtils {
        window.setStartPosition(position);
        window.setNumColumns(numColumns);
        if (cursor.moveToPosition(position)) {
-            do {
+            rowloop: do {
                if (!window.allocRow()) {
                    break;
                }
@@ -307,7 +307,7 @@ public class DatabaseUtils {
                    }
                    if (!success) {
                        window.freeLastRow();
-                        break;
+                        break rowloop;
                    }
                }
                position += 1;