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

Commit d07a3c42 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 70a4bcff c240b607
Loading
Loading
Loading
Loading
+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) {