diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-10-12 15:41:34 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-10-12 22:19:41 -0700 |
commit | 5e5d6d8ba04d7579df840cda055cd5dfa9d7666f (patch) | |
tree | b9c47baaa3b62795dfc12645da4bed2eb5d3ec13 /core/jni/android_database_CursorWindow.cpp | |
parent | 5b2dda3be5cc903aafb77ce7902c14d76eb26a9b (diff) | |
download | frameworks_base-5e5d6d8ba04d7579df840cda055cd5dfa9d7666f.zip frameworks_base-5e5d6d8ba04d7579df840cda055cd5dfa9d7666f.tar.gz frameworks_base-5e5d6d8ba04d7579df840cda055cd5dfa9d7666f.tar.bz2 |
Deprecate local-only CursorWindows.
There is no difference and has never really been a difference
between local-only and remotable CursorWindows. By removing the
distinction officially in the API, we will make it easier to
implement CrossProcessCursor correctly. CrossProcessCursor
is problematic currently because it's not clear whether a call
to getWindow() will return a local-only window or a remotable window.
As a result, the bulk cursor adaptor has special case handling
for AbstractWindowedCursors vs. ordinary CrossProcessCursors
so that it can set a remotable window before the cursor fills it.
All these problems go away if we just forget about local-only
windows being special in any way.
Change-Id: Ie59f517968e33d0ecb239c3c4f60206495e8f376
Diffstat (limited to 'core/jni/android_database_CursorWindow.cpp')
-rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index 722aeea..4a9fcf2 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -57,8 +57,7 @@ static void throwUnknownTypeException(JNIEnv * env, jint type) { jniThrowException(env, "java/lang/IllegalStateException", msg.string()); } -static jint nativeCreate(JNIEnv* env, jclass clazz, - jstring nameObj, jint cursorWindowSize, jboolean localOnly) { +static jint nativeCreate(JNIEnv* env, jclass clazz, jstring nameObj, jint cursorWindowSize) { String8 name; if (nameObj) { const char* nameStr = env->GetStringUTFChars(nameObj, NULL); @@ -70,7 +69,7 @@ static jint nativeCreate(JNIEnv* env, jclass clazz, } CursorWindow* window; - status_t status = CursorWindow::create(name, cursorWindowSize, localOnly, &window); + status_t status = CursorWindow::create(name, cursorWindowSize, &window); if (status || !window) { LOGE("Could not allocate CursorWindow '%s' of size %d due to error %d.", name.string(), cursorWindowSize, status); @@ -477,7 +476,7 @@ static jboolean nativePutNull(JNIEnv* env, jclass clazz, jint windowPtr, static JNINativeMethod sMethods[] = { /* name, signature, funcPtr */ - { "nativeCreate", "(Ljava/lang/String;IZ)I", + { "nativeCreate", "(Ljava/lang/String;I)I", (void*)nativeCreate }, { "nativeCreateFromParcel", "(Landroid/os/Parcel;)I", (void*)nativeCreateFromParcel }, |