Revert "Restore broken CursorWindow.getType behavior."

The Android Automerger · The Android Automerger · commit dd8f899a01b4 · 2011-10-27T17:42:01.000-07:00
This reverts commit aa32c30.
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp
@@ -147,10 +147,8 @@ static jint nativeGetType(JNIEnv* env, jclass clazz, jint windowPtr,
 
     field_slot_t* fieldSlot = window->getFieldSlotWithCheck(row, column);
     if (!fieldSlot) {
-        // FIXME: This is really broken but we have CTS tests that depend
-        // on this legacy behavior.
-        //throwExceptionWithRowCol(env, row, column);
-        return FIELD_TYPE_NULL;
+        throwExceptionWithRowCol(env, row, column);
+        return NULL;
     }
     return fieldSlot->type;
 }

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,8 @@ 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`		`- // 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;`
	`150`	`+ throwExceptionWithRowCol(env, row, column);`
	`151`	`+ return NULL;`
`154`	`152`	`}`
`155`	`153`	`return fieldSlot->type;`
`156`	`154`	`}`