commit 115f43cda758c807dc64695e1e66cd61b6c13a3f
author Steve Pomeroy <steve@staticfree.info> Fri May 13 01:17:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 13 01:17:54 2016 +0000
tree 11674dbec72d1310a4f065f3213af3901d86f3c4
parent 95a5be52c93345961489aabb9e3477272dcd38a9
parent d07a3c42034b35a0474619f9395a9d97abc83069

Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
am: d07a3c4203

* commit 'd07a3c42034b35a0474619f9395a9d97abc83069':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077

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

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 50e7356..0f64b92 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -1431,10 +1431,9 @@
      *            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) {