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

Commit 115f43cd authored by Steve Pomeroy's avatar Steve Pomeroy Committed by android-build-merger
Browse files

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

am: d07a3c42

* commit 'd07a3c42':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077
parents 95a5be52 d07a3c42

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

+3 −4
Original line number Original line 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

     *            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) {