Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591"

Browse Source
This commit is contained in:
Vasu Nori
2010-06-14 17:11:20 -07:00
committed by Android (Google) Code Review
parent 889eb886d3 0a2c6cc013
commit d127fb69ae
2 changed files with 10 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/database/CursorWindow.java
View File

@@ -224,8 +224,6 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
return getType(row, col) == Cursor.FIELD_TYPE_NULL;
}
private native boolean isNull_native(int row, int col);
/**
* Returns a byte array for the given field.
*
@@ -280,7 +278,8 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
*/
@Deprecated
public boolean isBlob(int row, int col) {
return getType(row, col) == Cursor.FIELD_TYPE_BLOB;
int type = getType(row, col);
return type == Cursor.FIELD_TYPE_BLOB || type == Cursor.FIELD_TYPE_NULL;
}
/**
@@ -319,13 +318,10 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
*/
@Deprecated
public boolean isString(int row, int col) {
return getType(row, col) == Cursor.FIELD_TYPE_STRING;
int type = getType(row, col);
return type == Cursor.FIELD_TYPE_STRING || type == Cursor.FIELD_TYPE_NULL;
}
private native boolean isBlob_native(int row, int col);
private native boolean isString_native(int row, int col);
private native boolean isInteger_native(int row, int col);
private native boolean isFloat_native(int row, int col);
private native int getType_native(int row, int col);
/**