diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-10-07 15:07:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 15:07:56 -0700 |
| commit | 4cc8bafb4b10614dc881ed8121ce4754811e161d (patch) | |
| tree | ffdd87cac45652e3df6121a654eeb70c291625cc /core/jni | |
| parent | b762d1e5eaae9f04f1141feaa402e3f8939d28cc (diff) | |
| parent | aa32c30b81134fc7ebd9408f4757d1dc4410f338 (diff) | |
| download | frameworks_base-4cc8bafb4b10614dc881ed8121ce4754811e161d.zip frameworks_base-4cc8bafb4b10614dc881ed8121ce4754811e161d.tar.gz frameworks_base-4cc8bafb4b10614dc881ed8121ce4754811e161d.tar.bz2 | |
Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index 14c6397..9ff2cb2 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -147,8 +147,10 @@ static jint nativeGetType(JNIEnv* env, jclass clazz, jint windowPtr, field_slot_t* fieldSlot = window->getFieldSlotWithCheck(row, column); if (!fieldSlot) { - throwExceptionWithRowCol(env, row, column); - return NULL; + // FIXME: This is really broken but we have CTS tests that depend + // on this legacy behavior. + //throwExceptionWithRowCol(env, row, column); + return FIELD_TYPE_NULL; } return fieldSlot->type; } |