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

Commit e1559479 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin
Browse files

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

java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: Ia0e5166475169769f22cfd4ee7e23b6408a5e981
parent a46c4537

core/java/android/view/textclassifier/ConversationAction.java

+4 −5
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ import android.os.Bundle; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.Preconditions;



import java.lang.annotation.Retention;

import java.util.Objects;



/** Represents the action suggested by a {@link TextClassifier} on a given conversation. */

public final class ConversationAction implements Parcelable {
@@ -133,11 +132,11 @@ public final class ConversationAction implements Parcelable { 
            @Nullable CharSequence textReply,

            float score,

            @NonNull Bundle extras) {

        mType = Preconditions.checkNotNull(type);

        mType = Objects.requireNonNull(type);

        mAction = action;

        mTextReply = textReply;

        mScore = score;

        mExtras = Preconditions.checkNotNull(extras);

        mExtras = Objects.requireNonNull(extras);

    }



    private ConversationAction(Parcel in) {
@@ -221,7 +220,7 @@ public final class ConversationAction implements Parcelable { 
        private Bundle mExtras;



        public Builder(@NonNull @ActionType String actionType) {

            mType = Preconditions.checkNotNull(actionType);

            mType = Objects.requireNonNull(actionType);

        }



        /**

core/java/android/view/textclassifier/ConversationActions.java

+7 −6
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import java.time.format.DateTimeFormatter; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;



/**

 * Represents a list of actions suggested by a {@link TextClassifier} on a given conversation.
@@ -66,7 +67,7 @@ public final class ConversationActions implements Parcelable { 
    public ConversationActions(

            @NonNull List<ConversationAction> conversationActions, @Nullable String id) {

        mConversationActions =

                Collections.unmodifiableList(Preconditions.checkNotNull(conversationActions));

                Collections.unmodifiableList(Objects.requireNonNull(conversationActions));

        mId = id;

    }
@@ -149,7 +150,7 @@ public final class ConversationActions implements Parcelable { 
            mAuthor = author;

            mReferenceTime = referenceTime;

            mText = text;

            mExtras = Preconditions.checkNotNull(bundle);

            mExtras = Objects.requireNonNull(bundle);

        }



        private Message(Parcel in) {
@@ -243,7 +244,7 @@ public final class ConversationActions implements Parcelable { 
             *               {@link #PERSON_USER_OTHERS} to represent a remote user.

             */

            public Builder(@NonNull Person author) {

                mAuthor = Preconditions.checkNotNull(author);

                mAuthor = Objects.requireNonNull(author);

            }



            /** Sets the text of this message. */
@@ -329,8 +330,8 @@ public final class ConversationActions implements Parcelable { 
                int maxSuggestions,

                @Nullable @Hint List<String> hints,

                @NonNull Bundle extras) {

            mConversation = Preconditions.checkNotNull(conversation);

            mTypeConfig = Preconditions.checkNotNull(typeConfig);

            mConversation = Objects.requireNonNull(conversation);

            mTypeConfig = Objects.requireNonNull(typeConfig);

            mMaxSuggestions = maxSuggestions;

            mHints = hints;

            mExtras = extras;
@@ -483,7 +484,7 @@ public final class ConversationActions implements Parcelable { 
             *     actions for.

             */

            public Builder(@NonNull List<Message> conversation) {

                mConversation = Preconditions.checkNotNull(conversation);

                mConversation = Objects.requireNonNull(conversation);

            }



            /**

core/java/android/view/textclassifier/EntityConfidence.java

+3 −4
Original line number Diff line number Diff line
@@ -22,12 +22,11 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.util.ArrayMap;



import com.android.internal.util.Preconditions;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Objects;



/**

 * Helper object for setting and getting entity scores for classified text.
@@ -42,7 +41,7 @@ final class EntityConfidence implements Parcelable { 
    EntityConfidence() {}



    EntityConfidence(@NonNull EntityConfidence source) {

        Preconditions.checkNotNull(source);

        Objects.requireNonNull(source);

        mEntityConfidence.putAll(source.mEntityConfidence);

        mSortedEntities.addAll(source.mSortedEntities);

    }
@@ -56,7 +55,7 @@ final class EntityConfidence implements Parcelable { 
     *               1 (high confidence).

     */

    EntityConfidence(@NonNull Map<String, Float> source) {

        Preconditions.checkNotNull(source);

        Objects.requireNonNull(source);



        // Prune non-existent entities and clamp to 1.

        mEntityConfidence.ensureCapacity(source.size());

core/java/android/view/textclassifier/GenerateLinksLogger.java

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.util.ArrayMap; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.Preconditions;



import java.util.Locale;

import java.util.Map;
@@ -66,9 +65,9 @@ public final class GenerateLinksLogger { 
    /** Logs statistics about a call to generateLinks. */

    public void logGenerateLinks(CharSequence text, TextLinks links, String callingPackageName,

            long latencyMs) {

        Preconditions.checkNotNull(text);

        Preconditions.checkNotNull(links);

        Preconditions.checkNotNull(callingPackageName);

        Objects.requireNonNull(text);

        Objects.requireNonNull(links);

        Objects.requireNonNull(callingPackageName);

        if (!shouldLog()) {

            return;

        }

core/java/android/view/textclassifier/ModelFileManager.java

+10 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.ParcelFileDescriptor; 
import android.text.TextUtils;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;



import java.io.File;

import java.io.FileNotFoundException;
@@ -51,7 +50,7 @@ public final class ModelFileManager { 
    private List<ModelFile> mModelFiles;



    public ModelFileManager(Supplier<List<ModelFile>> modelFileSupplier) {

        mModelFileSupplier = Preconditions.checkNotNull(modelFileSupplier);

        mModelFileSupplier = Objects.requireNonNull(modelFileSupplier);

    }



    /**
@@ -106,12 +105,12 @@ public final class ModelFileManager { 
                File updatedModelFile,

                Function<Integer, Integer> versionSupplier,

                Function<Integer, String> supportedLocalesSupplier) {

            mUpdatedModelFile = Preconditions.checkNotNull(updatedModelFile);

            mFactoryModelDir = Preconditions.checkNotNull(factoryModelDir);

            mUpdatedModelFile = Objects.requireNonNull(updatedModelFile);

            mFactoryModelDir = Objects.requireNonNull(factoryModelDir);

            mModelFilenamePattern = Pattern.compile(

                    Preconditions.checkNotNull(factoryModelFileNameRegex));

            mVersionSupplier = Preconditions.checkNotNull(versionSupplier);

            mSupportedLocalesSupplier = Preconditions.checkNotNull(supportedLocalesSupplier);

                    Objects.requireNonNull(factoryModelFileNameRegex));

            mVersionSupplier = Objects.requireNonNull(versionSupplier);

            mSupportedLocalesSupplier = Objects.requireNonNull(supportedLocalesSupplier);

        }



        @Override
@@ -208,10 +207,10 @@ public final class ModelFileManager { 
        public ModelFile(File file, int version, List<Locale> supportedLocales,

                String supportedLocalesStr,

                boolean languageIndependent) {

            mFile = Preconditions.checkNotNull(file);

            mFile = Objects.requireNonNull(file);

            mVersion = version;

            mSupportedLocales = Preconditions.checkNotNull(supportedLocales);

            mSupportedLocalesStr = Preconditions.checkNotNull(supportedLocalesStr);

            mSupportedLocales = Objects.requireNonNull(supportedLocales);

            mSupportedLocalesStr = Objects.requireNonNull(supportedLocalesStr);

            mLanguageIndependent = languageIndependent;

        }
@@ -232,7 +231,7 @@ public final class ModelFileManager { 


        /** Returns whether the language supports any language in the given ranges. */

        public boolean isAnyLanguageSupported(List<Locale.LanguageRange> languageRanges) {

            Preconditions.checkNotNull(languageRanges);

            Objects.requireNonNull(languageRanges);

            return mLanguageIndependent || Locale.lookup(languageRanges, mSupportedLocales) != null;

        }