Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cc8bafb authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents b762d1e5 aa32c30b

core/jni/android_database_CursorWindow.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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;

}