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

Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db

Browse Source 
am: 88968cc3ba

* commit '88968cc3baefc453d3564ca1546ae87adbbd1f31':
  Fix documentation bug in SQLiteDatabase

Change-Id: I67d580b53b8fb34ab4c7cbe0bd6dda7e31895e51
This commit is contained in:
Steve Pomeroy
2016-05-12 22:34:02 +00:00
committed by android-build-merger
parent d88ca0e659 88968cc3ba
commit 54bb5dbd65
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
* column values
* @param conflictAlgorithm for insert conflict resolver
* @return the row ID of the newly inserted row
* OR the primary key of the existing row if the input param 'conflictAlgorithm' =
* {@link #CONFLICT_IGNORE}
* OR -1 if any error
* @return the row ID of the newly inserted row OR <code>-1</code> if either the
* input parameter <code>conflictAlgorithm</code> = {@link #CONFLICT_IGNORE}
* or an error occurred.
*/
public long insertWithOnConflict(String table, String nullColumnHack,
ContentValues initialValues, int conflictAlgorithm) {