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

Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-13 01:08:51 +00:00
committed by Android (Google) Code Review
parent 70a4bcff70 c240b607f7
commit d07a3c4203
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -1431,10 +1431,9 @@ public final class SQLiteDatabase extends SQLiteClosable {
* row. The keys should be the column names and the values the * row. The keys should be the column names and the values the
* column values * column values
* @param conflictAlgorithm for insert conflict resolver * @param conflictAlgorithm for insert conflict resolver
* @return the row ID of the newly inserted row * @return the row ID of the newly inserted row OR <code>-1</code> if either the
* OR the primary key of the existing row if the input param 'conflictAlgorithm' = * input parameter <code>conflictAlgorithm</code> = {@link #CONFLICT_IGNORE}
* {@link #CONFLICT_IGNORE} * or an error occurred.
* OR -1 if any error
*/ */
public long insertWithOnConflict(String table, String nullColumnHack, public long insertWithOnConflict(String table, String nullColumnHack,
ContentValues initialValues, int conflictAlgorithm) { ContentValues initialValues, int conflictAlgorithm) {