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

Commit c240b607 authored by Steve Pomeroy's avatar Steve Pomeroy Committed by Nick Kralevich
Browse files

Fix documentation bug in SQLiteDatabase 

The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045



Signed-off-by: default avatarSteve Pomeroy <steve@staticfree.info>

(cherry picked from commit 8fc3144f)

Change-Id: I89e56428e612d667259744e2bc3df124e5a2aa0e
parent a63e1325

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

+3 −4
Original line number Diff line number Diff line
@@ -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) {