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

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

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with... 

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
parents d301ecf5 b7ac8d3e

core/java/android/database/AbstractCursor.java

+3 −4
Original line number Diff line number Diff line
@@ -24,13 +24,12 @@ import android.os.Build; 
import android.os.Bundle;

import android.util.Log;



import com.android.internal.util.Preconditions;



import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Objects;





/**
@@ -416,8 +415,8 @@ public abstract class AbstractCursor implements CrossProcessCursor { 


    @Override

    public void setNotificationUris(@NonNull ContentResolver cr, @NonNull List<Uri> notifyUris) {

        Preconditions.checkNotNull(cr);

        Preconditions.checkNotNull(notifyUris);

        Objects.requireNonNull(cr);

        Objects.requireNonNull(notifyUris);



        setNotificationUris(cr, notifyUris, cr.getUserId(), true);

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.WeakHashMap;



/**
@@ -2691,7 +2692,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
             */

            @NonNull

            public Builder setJournalMode(@NonNull  String journalMode) {

                Preconditions.checkNotNull(journalMode);

                Objects.requireNonNull(journalMode);

                mJournalMode = journalMode;

                return this;

            }
@@ -2703,7 +2704,7 @@ public final class SQLiteDatabase extends SQLiteClosable { 
             */

            @NonNull

            public Builder setSynchronousMode(@NonNull String syncMode) {

                Preconditions.checkNotNull(syncMode);

                Objects.requireNonNull(syncMode);

                mSyncMode = syncMode;

                return this;

            }

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

+3 −4
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; 
import android.os.FileUtils;

import android.util.Log;



import com.android.internal.util.Preconditions;



import java.io.File;

import java.util.Objects;



/**

 * A helper class to manage database creation and version management.
@@ -161,7 +160,7 @@ public abstract class SQLiteOpenHelper implements AutoCloseable { 
    private SQLiteOpenHelper(@Nullable Context context, @Nullable String name, int version,

            int minimumSupportedVersion,

            @NonNull SQLiteDatabase.OpenParams.Builder openParamsBuilder) {

        Preconditions.checkNotNull(openParamsBuilder);

        Objects.requireNonNull(openParamsBuilder);

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



        mContext = context;
@@ -245,7 +244,7 @@ public abstract class SQLiteOpenHelper implements AutoCloseable { 
     * @throws IllegalStateException if the database is already open

     */

    public void setOpenParams(@NonNull SQLiteDatabase.OpenParams openParams) {

        Preconditions.checkNotNull(openParams);

        Objects.requireNonNull(openParams);

        synchronized (this) {

            if (mDatabase != null && mDatabase.isOpen()) {

                throw new IllegalStateException(