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

Merge "Fixing an issue with convert... utility methods."

Browse Source
This commit is contained in:
Dmitri Plotnikov
2010-09-02 09:24:37 -07:00
committed by Android (Google) Code Review
parent 01c1f9d9e9 9a9ce6067f
commit 0525f95bb1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/database/DatabaseUtils.java
View File

@@ -769,8 +769,8 @@ public class DatabaseUtils {
*/
public static void cursorStringToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getString(index));
}
}
@@ -785,8 +785,8 @@ public class DatabaseUtils {
*/
public static void cursorLongToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getLong(index));
}
}
@@ -801,8 +801,8 @@ public class DatabaseUtils {
*/
public static void cursorShortToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getShort(index));
}
}
@@ -817,8 +817,8 @@ public class DatabaseUtils {
*/
public static void cursorIntToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getInt(index));
}
}
@@ -833,8 +833,8 @@ public class DatabaseUtils {
*/
public static void cursorFloatToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getFloat(index));
}
}
@@ -849,8 +849,8 @@ public class DatabaseUtils {
*/
public static void cursorDoubleToContentValuesIfPresent(Cursor cursor, ContentValues values,
String column) {
final int index = cursor.getColumnIndexOrThrow(column);
if (!cursor.isNull(index)) {
final int index = cursor.getColumnIndex(column);
if (index != -1 && !cursor.isNull(index)) {
values.put(column, cursor.getDouble(index));
}
}