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

Merge "Replace try-catch code by proper type checking. Saves an exception for each blob."

Browse Source
This commit is contained in:
Daniel Lehmann
2010-07-19 18:03:08 -07:00
committed by Android (Google) Code Review
parent 3a18eb93da 156add9575
commit 47f79bb4c5
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/provider/ContactsContract.java
View File

@@ -2113,28 +2113,21 @@ public final class ContactsContract {
Data.DATA_VERSION);
for (String key : DATA_KEYS) {
final int columnIndex = cursor.getColumnIndexOrThrow(key);
if (cursor.isNull(columnIndex)) {
// don't put anything
} else {
try {
switch (cursor.getType(columnIndex)) {
case Cursor.FIELD_TYPE_NULL:
// don't put anything
break;
case Cursor.FIELD_TYPE_INTEGER:
case Cursor.FIELD_TYPE_FLOAT:
case Cursor.FIELD_TYPE_STRING:
cv.put(key, cursor.getString(columnIndex));
} catch (SQLiteException e) {
break;
case Cursor.FIELD_TYPE_BLOB:
cv.put(key, cursor.getBlob(columnIndex));
}
break;
default:
throw new IllegalStateException("Invalid or unhandled data type");
}
// TODO: go back to this version of the code when bug
// http://b/issue?id=2306370 is fixed.
// if (cursor.isNull(columnIndex)) {
// // don't put anything
// } else if (cursor.isLong(columnIndex)) {
// values.put(key, cursor.getLong(columnIndex));
// } else if (cursor.isFloat(columnIndex)) {
// values.put(key, cursor.getFloat(columnIndex));
// } else if (cursor.isString(columnIndex)) {
// values.put(key, cursor.getString(columnIndex));
// } else if (cursor.isBlob(columnIndex)) {
// values.put(key, cursor.getBlob(columnIndex));
// }
}
contact.addSubValue(ContactsContract.Data.CONTENT_URI, cv);
} while (cursor.moveToNext());