Revert "Clean up CursorWindow code."

This reverts commit 3bc6bbc.

Author: The Android Automerger

core/java/android/database/CursorWindow.java

@@ -18,12 +18,17 @@
 
 /**
  * This exception is thrown when a CursorWindow couldn't be allocated,
- * most probably due to memory not being available.
- *
- * @hide
+ * most probably due to memory not being available
  */
-public class CursorWindowAllocationException extends RuntimeException {
-    public CursorWindowAllocationException(String description) {
+class CursorWindowAllocationException extends java.lang.RuntimeException
+{
+    public CursorWindowAllocationException()
+    {
+        super();
+    }
+
+    public CursorWindowAllocationException(String description)
+    {
         super(description);
     }
 }

core/java/android/database/CursorWindowAllocationException.java

@@ -79,7 +79,7 @@ public class SQLiteQuery extends SQLiteProgram {
                 // if the start pos is not equal to 0, then most likely window is
                 // too small for the data set, loading by another thread
                 // is not safe in this situation. the native code will ignore maxRead
-                int numRows = native_fill_window(window.mWindowPtr, window.getStartPosition(),
+                int numRows = native_fill_window(window, window.getStartPosition(),
                         mOffsetIndex, maxRead, lastPos);
                 mDatabase.logTimeStat(mSql, timeStart);
                 return numRows;
@@ -154,7 +154,7 @@ public void close() {
         compileAndbindAllArgs();
     }
 
-    private final native int native_fill_window(int windowPtr,
+    private final native int native_fill_window(CursorWindow window,
             int startPos, int offsetParam, int maxRead, int lastPos);
 
     private final native int native_column_count();