diff options
Diffstat (limited to 'core/jni/android_database_SQLiteQuery.cpp')
| -rw-r--r-- | core/jni/android_database_SQLiteQuery.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/jni/android_database_SQLiteQuery.cpp b/core/jni/android_database_SQLiteQuery.cpp index 9e42189..fe62256 100644 --- a/core/jni/android_database_SQLiteQuery.cpp +++ b/core/jni/android_database_SQLiteQuery.cpp @@ -35,12 +35,6 @@ namespace android { -sqlite3_stmt * compile(JNIEnv* env, jobject object, - sqlite3 * handle, jstring sqlString); - -// From android_database_CursorWindow.cpp -CursorWindow * get_window_from_object(JNIEnv * env, jobject javaWindow); - static jfieldID gHandleField; static jfieldID gStatementField; @@ -105,7 +99,7 @@ static int finish_program_and_get_row_count(sqlite3_stmt *statement) { return numRows; } -static jint native_fill_window(JNIEnv* env, jobject object, jobject javaWindow, +static jint native_fill_window(JNIEnv* env, jobject object, jint windowPtr, jint startPos, jint offsetParam, jint maxRead, jint lastPos) { int err; @@ -142,7 +136,7 @@ static jint native_fill_window(JNIEnv* env, jobject object, jobject javaWindow, } // Get the native window - window = get_window_from_object(env, javaWindow); + window = reinterpret_cast<CursorWindow*>(windowPtr); if (!window) { LOGE("Invalid CursorWindow"); jniThrowException(env, "java/lang/IllegalArgumentException", @@ -360,7 +354,7 @@ static jstring native_column_name(JNIEnv* env, jobject object, jint columnIndex) static JNINativeMethod sMethods[] = { /* name, signature, funcPtr */ - {"native_fill_window", "(Landroid/database/CursorWindow;IIII)I", + {"native_fill_window", "(IIIII)I", (void *)native_fill_window}, {"native_column_count", "()I", (void*)native_column_count}, {"native_column_name", "(I)Ljava/lang/String;", (void *)native_column_name}, |