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

Commit e1d2be60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix typos in SQLite javadocs" into main am: b99205f8 am: d0066e64... 

Merge "Fix typos in SQLite javadocs" into main am: b99205f8 am: d0066e64 am: 13ef64e0 am: c67ba6a7 am: 90f751d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704593



Change-Id: I1259464deedaa10c5db2d9bc71c7f32b5ca655fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65b33372 90f751d6

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

+4 −4
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
     * Open the database according to the flags {@link #OPEN_READWRITE}

     * {@link #OPEN_READONLY} {@link #CREATE_IF_NECESSARY} and/or {@link #NO_LOCALIZED_COLLATORS}.

     *

     * <p>Sets the locale of the database to the  the system's current locale.

     * <p>Sets the locale of the database to the system's current locale.

     * Call {@link #setLocale} if you would like something else.</p>

     *

     * @param path to database file to open and/or create
@@ -1002,7 +1002,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
     * Open the database according to the flags {@link #OPEN_READWRITE}

     * {@link #OPEN_READONLY} {@link #CREATE_IF_NECESSARY} and/or {@link #NO_LOCALIZED_COLLATORS}.

     *

     * <p>Sets the locale of the database to the  the system's current locale.

     * <p>Sets the locale of the database to the system's current locale.

     * Call {@link #setLocale} if you would like something else.</p>

     *

     * <p>Accepts input param: a concrete instance of {@link DatabaseErrorHandler} to be
@@ -1163,7 +1163,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
     * Create a memory backed SQLite database.  Its contents will be destroyed

     * when the database is closed.

     *

     * <p>Sets the locale of the database to the  the system's current locale.

     * <p>Sets the locale of the database to the system's current locale.

     * Call {@link #setLocale} if you would like something else.</p>

     *

     * @param factory an optional factory class that is called to instantiate a
@@ -1182,7 +1182,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
     * Create a memory backed SQLite database.  Its contents will be destroyed

     * when the database is closed.

     *

     * <p>Sets the locale of the database to the  the system's current locale.

     * <p>Sets the locale of the database to the system's current locale.

     * Call {@link #setLocale} if you would like something else.</p>

     * @param openParams configuration parameters that are used for opening SQLiteDatabase

     * @return a SQLiteDatabase instance