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

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

Merge "Allow null context in the constructor"

parents c3e1d7b3 9d4c3d9a

core/java/android/database/sqlite/SQLiteOpenHelper.java

+5 −6
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ public abstract class SQLiteOpenHelper { 
     *     {@link #onUpgrade} will be used to upgrade the database; if the database is

     *     {@link #onUpgrade} will be used to upgrade the database; if the database is

     *     newer, {@link #onDowngrade} will be used to downgrade the database

     *     newer, {@link #onDowngrade} will be used to downgrade the database

     */

     */

    public SQLiteOpenHelper(@NonNull Context context, @Nullable String name,

    public SQLiteOpenHelper(@Nullable Context context, @Nullable String name,

            @Nullable CursorFactory factory, int version) {

            @Nullable CursorFactory factory, int version) {

        this(context, name, factory, version, null);

        this(context, name, factory, version, null);

    }

    }
@@ -95,7 +95,7 @@ public abstract class SQLiteOpenHelper { 
     * @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database

     * @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database

     * corruption, or null to use the default error handler.

     * corruption, or null to use the default error handler.

     */

     */

    public SQLiteOpenHelper(@NonNull Context context, @Nullable String name,

    public SQLiteOpenHelper(@Nullable Context context, @Nullable String name,

            @Nullable CursorFactory factory, int version,

            @Nullable CursorFactory factory, int version,

            @Nullable DatabaseErrorHandler errorHandler) {

            @Nullable DatabaseErrorHandler errorHandler) {

        this(context, name, factory, version, 0, errorHandler);

        this(context, name, factory, version, 0, errorHandler);
@@ -116,7 +116,7 @@ public abstract class SQLiteOpenHelper { 
     *        Please note that {@link SQLiteDatabase#CREATE_IF_NECESSARY} flag will always be

     *        Please note that {@link SQLiteDatabase#CREATE_IF_NECESSARY} flag will always be

     *        set when the helper opens the database

     *        set when the helper opens the database

     */

     */

    public SQLiteOpenHelper(@NonNull Context context, @Nullable String name, int version,

    public SQLiteOpenHelper(@Nullable Context context, @Nullable String name, int version,

            @NonNull SQLiteDatabase.OpenParams openParams) {

            @NonNull SQLiteDatabase.OpenParams openParams) {

        this(context, name, version, 0, openParams.toBuilder());

        this(context, name, version, 0, openParams.toBuilder());

    }

    }
@@ -144,7 +144,7 @@ public abstract class SQLiteOpenHelper { 
     * @see #onUpgrade(SQLiteDatabase, int, int)

     * @see #onUpgrade(SQLiteDatabase, int, int)

     * @hide

     * @hide

     */

     */

    public SQLiteOpenHelper(@NonNull Context context, @Nullable String name,

    public SQLiteOpenHelper(@Nullable Context context, @Nullable String name,

            @Nullable CursorFactory factory, int version,

            @Nullable CursorFactory factory, int version,

            int minimumSupportedVersion, @Nullable DatabaseErrorHandler errorHandler) {

            int minimumSupportedVersion, @Nullable DatabaseErrorHandler errorHandler) {

        this(context, name, version, minimumSupportedVersion,

        this(context, name, version, minimumSupportedVersion,
@@ -153,10 +153,9 @@ public abstract class SQLiteOpenHelper { 
        mOpenParamsBuilder.setErrorHandler(errorHandler);

        mOpenParamsBuilder.setErrorHandler(errorHandler);

    }

    }





    private SQLiteOpenHelper(@NonNull Context context, @Nullable String name, int version,

    private SQLiteOpenHelper(@Nullable Context context, @Nullable String name, int version,

            int minimumSupportedVersion,

            int minimumSupportedVersion,

            @NonNull SQLiteDatabase.OpenParams.Builder openParamsBuilder) {

            @NonNull SQLiteDatabase.OpenParams.Builder openParamsBuilder) {

        Preconditions.checkNotNull(context);

        Preconditions.checkNotNull(openParamsBuilder);

        Preconditions.checkNotNull(openParamsBuilder);

        if (version < 1) throw new IllegalArgumentException("Version must be >= 1, was " + version);

        if (version < 1) throw new IllegalArgumentException("Version must be >= 1, was " + version);