am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit '17fa101c3744dc0834b86f0841cf29bbfd1f6f29': Terminate loop properly when cursor window is full.
2015-06-02 14:22:27 +00:00
parent 97e5851aec 17fa101c37
commit fab99fd899
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;