Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict" (5c5dfd0a) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteDatabase.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1772,8 +1772,7 @@ public class SQLiteDatabase extends SQLiteClosable {
		*/
		public int updateWithOnConflict(String table, ContentValues values,
		String whereClause, String[] whereArgs, int conflictAlgorithm) {
		int setValuesSize = values.size();
		if (values == null \|\| setValuesSize == 0) {
		if (values == null \|\| values.size() == 0) {
		throw new IllegalArgumentException("Empty values");
		}

		@@ -1784,6 +1783,7 @@ public class SQLiteDatabase extends SQLiteClosable {
		sql.append(" SET ");

		// move all bind args to one array
		int setValuesSize = values.size();
		int bindArgsSize = (whereArgs == null) ? setValuesSize : (setValuesSize + whereArgs.length);
		Object[] bindArgs = new Object[bindArgsSize];
		int i = 0;