Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"

Jeff Brown · Android (Google) Code Review · commit 4cc8bafb4b10 · 2011-10-07T15:07:56.000-07:00
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,10 @@ static jint nativeGetType(JNIEnv* env, jclass clazz, jint windowPtr,`
`147`	`147`
`148`	`148`	`field_slot_t* fieldSlot = window->getFieldSlotWithCheck(row, column);`
`149`	`149`	`if (!fieldSlot) {`
`150`		`- throwExceptionWithRowCol(env, row, column);`
`151`		`- return NULL;`
	`150`	`+ // FIXME: This is really broken but we have CTS tests that depend`
	`151`	`+ // on this legacy behavior.`
	`152`	`+ //throwExceptionWithRowCol(env, row, column);`
	`153`	`+ return FIELD_TYPE_NULL;`
`152`	`154`	`}`
`153`	`155`	`return fieldSlot->type;`
`154`	`156`	`}`