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

Merge "Also parse "1" as true for ContentValues#getAsBoolean"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-25 20:19:05 +00:00
committed by Android (Google) Code Review
parent 73c945de33 794cf190aa
commit a92c180107
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/ContentValues.java
View File

@@ -414,7 +414,11 @@ public final class ContentValues implements Parcelable {
return (Boolean) value;
} catch (ClassCastException e) {
if (value instanceof CharSequence) {
return Boolean.valueOf(value.toString());
// Note that we also check against 1 here because SQLite's internal representation
// for booleans is an integer with a value of 0 or 1. Without this check, boolean
// values obtained via DatabaseUtils#cursorRowToContentValues will always return
// false.
return Boolean.valueOf(value.toString()) || "1".equals(value);
} else if (value instanceof Number) {
return ((Number) value).intValue() != 0;
} else {

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

@@ -728,13 +728,10 @@ public class DatabaseUtils {
* @param values the {@link ContentValues} to put the row into.
*/
public static void cursorRowToContentValues(Cursor cursor, ContentValues values) {
AbstractWindowedCursor awc =
(cursor instanceof AbstractWindowedCursor) ? (AbstractWindowedCursor) cursor : null;
String[] columns = cursor.getColumnNames();
int length = columns.length;
for (int i = 0; i < length; i++) {
if (awc != null && awc.isBlob(i)) {
if (cursor.getType(i) == Cursor.FIELD_TYPE_BLOB) {
values.put(columns[i], cursor.getBlob(i));
} else {
values.put(columns[i], cursor.getString(i));