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

Commit a92c1801 authored Jan 25, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Jan 25, 2017

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

parents 73c945de 794cf190

core/java/android/content/ContentValues.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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 {

core/java/android/database/DatabaseUtils.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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));