Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am:... (5f71bfc7) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -1371,6 +1371,7 @@ public final class SQLiteDatabase extends SQLiteClosable {

		/**
		* Convenience method for replacing a row in the database.
		* Inserts a new row if a row does not already exist.
		*
		* @param table the table in which to replace the row
		* @param nullColumnHack optional; may be <code>null</code>.
		@@ -1381,7 +1382,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* provides the name of nullable column name to explicitly insert a NULL into
		* in the case where your <code>initialValues</code> is empty.
		* @param initialValues this map contains the initial column values for
		* the row.
		* the row. The keys should be the column names and the values the column values.
		* @return the row ID of the newly inserted row, or -1 if an error occurred
		*/
		public long replace(String table, String nullColumnHack, ContentValues initialValues) {
		@@ -1396,6 +1397,7 @@ public final class SQLiteDatabase extends SQLiteClosable {

		/**
		* Convenience method for replacing a row in the database.
		* Inserts a new row if a row does not already exist.
		*
		* @param table the table in which to replace the row
		* @param nullColumnHack optional; may be <code>null</code>.
		@@ -1406,7 +1408,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* provides the name of nullable column name to explicitly insert a NULL into
		* in the case where your <code>initialValues</code> is empty.
		* @param initialValues this map contains the initial column values for
		* the row. The key
		* the row. The keys should be the column names and the values the column values.
		* @throws SQLException
		* @return the row ID of the newly inserted row, or -1 if an error occurred
		*/