Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-18 16:42:02 +00:00
committed by Android (Google) Code Review
parent 277353090c e1559479eb
commit 6d080ff13b
23 changed files with 119 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/textclassifier/ConversationAction.java
View File

@@ -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);
}
/**

13
core/java/android/view/textclassifier/ConversationActions.java
View File

@@ -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);
}
/**

7
core/java/android/view/textclassifier/EntityConfidence.java
View File

@@ -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());

7
core/java/android/view/textclassifier/GenerateLinksLogger.java
View File

@@ -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;
}

21
core/java/android/view/textclassifier/ModelFileManager.java
View File

@@ -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;
}

10
core/java/android/view/textclassifier/SelectionEvent.java
View File

@@ -149,7 +149,7 @@ public final class SelectionEvent implements Parcelable {
mAbsoluteStart = start;
mAbsoluteEnd = end;
mEventType = eventType;
mEntityType = Preconditions.checkNotNull(entityType);
mEntityType = Objects.requireNonNull(entityType);
mResultId = resultId;
mInvocationMethod = invocationMethod;
}
@@ -257,7 +257,7 @@ public final class SelectionEvent implements Parcelable {
public static SelectionEvent createSelectionModifiedEvent(
int start, int end, @NonNull TextClassification classification) {
Preconditions.checkArgument(end >= start, "end cannot be less than start");
Preconditions.checkNotNull(classification);
Objects.requireNonNull(classification);
final String entityType = classification.getEntityCount() > 0
? classification.getEntity(0)
: TextClassifier.TYPE_UNKNOWN;
@@ -281,7 +281,7 @@ public final class SelectionEvent implements Parcelable {
public static SelectionEvent createSelectionModifiedEvent(
int start, int end, @NonNull TextSelection selection) {
Preconditions.checkArgument(end >= start, "end cannot be less than start");
Preconditions.checkNotNull(selection);
Objects.requireNonNull(selection);
final String entityType = selection.getEntityCount() > 0
? selection.getEntity(0)
: TextClassifier.TYPE_UNKNOWN;
@@ -329,7 +329,7 @@ public final class SelectionEvent implements Parcelable {
int start, int end, @SelectionEvent.ActionType int actionType,
@NonNull TextClassification classification) {
Preconditions.checkArgument(end >= start, "end cannot be less than start");
Preconditions.checkNotNull(classification);
Objects.requireNonNull(classification);
checkActionType(actionType);
final String entityType = classification.getEntityCount() > 0
? classification.getEntity(0)
@@ -398,7 +398,7 @@ public final class SelectionEvent implements Parcelable {
}
void setEntityType(@EntityType String entityType) {
mEntityType = Preconditions.checkNotNull(entityType);
mEntityType = Objects.requireNonNull(entityType);
}
/**

13
core/java/android/view/textclassifier/SelectionSessionLogger.java
View File

@@ -24,7 +24,6 @@ import android.metrics.LogMaker;
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.text.BreakIterator;
import java.util.List;
@@ -65,12 +64,12 @@ public final class SelectionSessionLogger {
@VisibleForTesting
public SelectionSessionLogger(@NonNull MetricsLogger metricsLogger) {
mMetricsLogger = Preconditions.checkNotNull(metricsLogger);
mMetricsLogger = Objects.requireNonNull(metricsLogger);
}
/** Emits a selection event to the logs. */
public void writeEvent(@NonNull SelectionEvent event) {
Preconditions.checkNotNull(event);
Objects.requireNonNull(event);
final LogMaker log = new LogMaker(MetricsEvent.TEXT_SELECTION_SESSION)
.setType(getLogType(event))
.setSubtype(getLogSubType(event))
@@ -240,7 +239,7 @@ public final class SelectionSessionLogger {
* Returns a token iterator for tokenizing text for logging purposes.
*/
public static BreakIterator getTokenIterator(@NonNull Locale locale) {
return BreakIterator.getWordInstance(Preconditions.checkNotNull(locale));
return BreakIterator.getWordInstance(Objects.requireNonNull(locale));
}
/**
@@ -249,9 +248,9 @@ public final class SelectionSessionLogger {
public static String createId(
String text, int start, int end, Context context, int modelVersion,
List<Locale> locales) {
Preconditions.checkNotNull(text);
Preconditions.checkNotNull(context);
Preconditions.checkNotNull(locales);
Objects.requireNonNull(text);
Objects.requireNonNull(context);
Objects.requireNonNull(locales);
final StringJoiner localesJoiner = new StringJoiner(",");
for (Locale locale : locales) {
localesJoiner.add(locale.toLanguageTag());

22
core/java/android/view/textclassifier/SystemTextClassifier.java
View File

@@ -33,8 +33,8 @@ import android.service.textclassifier.TextClassifierService;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.annotations.VisibleForTesting.Visibility;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -61,10 +61,10 @@ public final class SystemTextClassifier implements TextClassifier {
throws ServiceManager.ServiceNotFoundException {
mManagerService = ITextClassifierService.Stub.asInterface(
ServiceManager.getServiceOrThrow(Context.TEXT_CLASSIFICATION_SERVICE));
mSettings = Preconditions.checkNotNull(settings);
mSettings = Objects.requireNonNull(settings);
mFallback = context.getSystemService(TextClassificationManager.class)
.getTextClassifier(TextClassifier.LOCAL);
mPackageName = Preconditions.checkNotNull(context.getOpPackageName());
mPackageName = Objects.requireNonNull(context.getOpPackageName());
mUserId = context.getUserId();
}
@@ -74,7 +74,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
@WorkerThread
public TextSelection suggestSelection(TextSelection.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
request.setCallingPackageName(mPackageName);
@@ -98,7 +98,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
@WorkerThread
public TextClassification classifyText(TextClassification.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
request.setCallingPackageName(mPackageName);
@@ -122,7 +122,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
@WorkerThread
public TextLinks generateLinks(@NonNull TextLinks.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
if (!mSettings.isSmartLinkifyEnabled() && request.isLegacyFallback()) {
@@ -147,7 +147,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
public void onSelectionEvent(SelectionEvent event) {
Preconditions.checkNotNull(event);
Objects.requireNonNull(event);
Utils.checkMainThread();
try {
@@ -160,7 +160,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
public void onTextClassifierEvent(@NonNull TextClassifierEvent event) {
Preconditions.checkNotNull(event);
Objects.requireNonNull(event);
Utils.checkMainThread();
try {
@@ -178,7 +178,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
public TextLanguage detectLanguage(TextLanguage.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
@@ -199,7 +199,7 @@ public final class SystemTextClassifier implements TextClassifier {
@Override
public ConversationActions suggestConversationActions(ConversationActions.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
@@ -260,7 +260,7 @@ public final class SystemTextClassifier implements TextClassifier {
void initializeRemoteSession(
@NonNull TextClassificationContext classificationContext,
@NonNull TextClassificationSessionId sessionId) {
mSessionId = Preconditions.checkNotNull(sessionId);
mSessionId = Objects.requireNonNull(sessionId);
try {
classificationContext.setUserId(mUserId);
mManagerService.onCreateTextClassificationSession(classificationContext, mSessionId);

4
core/java/android/view/textclassifier/TextClassification.java
View File

@@ -150,7 +150,7 @@ public final class TextClassification implements Parcelable {
mLegacyIntent = legacyIntent;
mLegacyOnClickListener = legacyOnClickListener;
mActions = Collections.unmodifiableList(actions);
mEntityConfidence = Preconditions.checkNotNull(entityConfidence);
mEntityConfidence = Objects.requireNonNull(entityConfidence);
mId = id;
mExtras = extras;
}
@@ -287,7 +287,7 @@ public final class TextClassification implements Parcelable {
* @hide
*/
public static OnClickListener createIntentOnClickListener(@NonNull final PendingIntent intent) {
Preconditions.checkNotNull(intent);
Objects.requireNonNull(intent);
return v -> {
try {
intent.send();

11
core/java/android/view/textclassifier/TextClassificationContext.java
View File

@@ -24,9 +24,8 @@ import android.os.Parcelable;
import android.os.UserHandle;
import android.view.textclassifier.TextClassifier.WidgetType;
import com.android.internal.util.Preconditions;
import java.util.Locale;
import java.util.Objects;
/**
* A representation of the context in which text classification would be performed.
@@ -44,8 +43,8 @@ public final class TextClassificationContext implements Parcelable {
String packageName,
String widgetType,
String widgetVersion) {
mPackageName = Preconditions.checkNotNull(packageName);
mWidgetType = Preconditions.checkNotNull(widgetType);
mPackageName = Objects.requireNonNull(packageName);
mWidgetType = Objects.requireNonNull(widgetType);
mWidgetVersion = widgetVersion;
}
@@ -121,8 +120,8 @@ public final class TextClassificationContext implements Parcelable {
* @return this builder
*/
public Builder(@NonNull String packageName, @NonNull @WidgetType String widgetType) {
mPackageName = Preconditions.checkNotNull(packageName);
mWidgetType = Preconditions.checkNotNull(widgetType);
mPackageName = Objects.requireNonNull(packageName);
mWidgetType = Objects.requireNonNull(widgetType);
}
/**

14
core/java/android/view/textclassifier/TextClassificationManager.java
View File

@@ -31,9 +31,9 @@ import android.view.textclassifier.TextClassifier.TextClassifierType;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.lang.ref.WeakReference;
import java.util.Objects;
import java.util.Set;
/**
@@ -71,7 +71,7 @@ public final class TextClassificationManager {
/** @hide */
public TextClassificationManager(Context context) {
mContext = Preconditions.checkNotNull(context);
mContext = Objects.requireNonNull(context);
mSessionFactory = mDefaultSessionFactory;
mSettingsObserver = new SettingsObserver(this);
}
@@ -157,10 +157,10 @@ public final class TextClassificationManager {
@NonNull
public TextClassifier createTextClassificationSession(
@NonNull TextClassificationContext classificationContext) {
Preconditions.checkNotNull(classificationContext);
Objects.requireNonNull(classificationContext);
final TextClassifier textClassifier =
mSessionFactory.createTextClassificationSession(classificationContext);
Preconditions.checkNotNull(textClassifier, "Session Factory should never return null");
Objects.requireNonNull(textClassifier, "Session Factory should never return null");
return textClassifier;
}
@@ -170,8 +170,8 @@ public final class TextClassificationManager {
*/
public TextClassifier createTextClassificationSession(
TextClassificationContext classificationContext, TextClassifier textClassifier) {
Preconditions.checkNotNull(classificationContext);
Preconditions.checkNotNull(textClassifier);
Objects.requireNonNull(classificationContext);
Objects.requireNonNull(textClassifier);
return new TextClassificationSession(classificationContext, textClassifier);
}
@@ -280,7 +280,7 @@ public final class TextClassificationManager {
/** @hide */
public static TextClassificationConstants getSettings(Context context) {
Preconditions.checkNotNull(context);
Objects.requireNonNull(context);
final TextClassificationManager tcm =
context.getSystemService(TextClassificationManager.class);
if (tcm != null) {

9
core/java/android/view/textclassifier/TextClassificationSession.java
View File

@@ -20,6 +20,7 @@ import android.annotation.WorkerThread;
import android.view.textclassifier.SelectionEvent.InvocationMethod;
import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
* Session-aware TextClassifier.
@@ -37,8 +38,8 @@ final class TextClassificationSession implements TextClassifier {
private boolean mDestroyed;
TextClassificationSession(TextClassificationContext context, TextClassifier delegate) {
mClassificationContext = Preconditions.checkNotNull(context);
mDelegate = Preconditions.checkNotNull(delegate);
mClassificationContext = Objects.requireNonNull(context);
mDelegate = Objects.requireNonNull(delegate);
mSessionId = new TextClassificationSessionId();
mEventHelper = new SelectionEventHelper(mSessionId, mClassificationContext);
initializeRemoteSession();
@@ -149,8 +150,8 @@ final class TextClassificationSession implements TextClassifier {
SelectionEventHelper(
TextClassificationSessionId sessionId, TextClassificationContext context) {
mSessionId = Preconditions.checkNotNull(sessionId);
mContext = Preconditions.checkNotNull(context);
mSessionId = Objects.requireNonNull(sessionId);
mContext = Objects.requireNonNull(context);
}
/**

5
core/java/android/view/textclassifier/TextClassificationSessionId.java
View File

@@ -20,9 +20,8 @@ import android.annotation.NonNull;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.util.Locale;
import java.util.Objects;
import java.util.UUID;
/**
@@ -118,7 +117,7 @@ public final class TextClassificationSessionId implements Parcelable {
@Override
public TextClassificationSessionId createFromParcel(Parcel parcel) {
return new TextClassificationSessionId(
Preconditions.checkNotNull(parcel.readString()));
Objects.requireNonNull(parcel.readString()));
}
@Override

17
core/java/android/view/textclassifier/TextClassifier.java
View File

@@ -46,6 +46,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
/**
@@ -193,7 +194,7 @@ public interface TextClassifier {
@WorkerThread
@NonNull
default TextSelection suggestSelection(@NonNull TextSelection.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
return new TextSelection.Builder(request.getStartIndex(), request.getEndIndex()).build();
}
@@ -252,7 +253,7 @@ public interface TextClassifier {
@WorkerThread
@NonNull
default TextClassification classifyText(@NonNull TextClassification.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
return TextClassification.EMPTY;
}
@@ -313,7 +314,7 @@ public interface TextClassifier {
@WorkerThread
@NonNull
default TextLinks generateLinks(@NonNull TextLinks.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
return new TextLinks.Builder(request.getText().toString()).build();
}
@@ -346,7 +347,7 @@ public interface TextClassifier {
@WorkerThread
@NonNull
default TextLanguage detectLanguage(@NonNull TextLanguage.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
return TextLanguage.EMPTY;
}
@@ -358,7 +359,7 @@ public interface TextClassifier {
@NonNull
default ConversationActions suggestConversationActions(
@NonNull ConversationActions.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
return new ConversationActions(Collections.emptyList(), null);
}
@@ -427,9 +428,9 @@ public interface TextClassifier {
List<String> excludedEntityTypes,
List<String> hints,
boolean includeTypesFromTextClassifier) {
mIncludedTypes = Preconditions.checkNotNull(includedEntityTypes);
mExcludedTypes = Preconditions.checkNotNull(excludedEntityTypes);
mHints = Preconditions.checkNotNull(hints);
mIncludedTypes = Objects.requireNonNull(includedEntityTypes);
mExcludedTypes = Objects.requireNonNull(excludedEntityTypes);
mHints = Objects.requireNonNull(hints);
mIncludeTypesFromTextClassifier = includeTypesFromTextClassifier;
}

8
core/java/android/view/textclassifier/TextClassifierEvent.java
View File

@@ -25,11 +25,11 @@ import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
import java.util.Objects;
/**
* This class represents events that are sent by components to the {@link TextClassifier} to report
@@ -549,7 +549,7 @@ public abstract class TextClassifierEvent implements Parcelable {
*/
@NonNull
public T setEntityTypes(@NonNull String... entityTypes) {
Preconditions.checkNotNull(entityTypes);
Objects.requireNonNull(entityTypes);
mEntityTypes = new String[entityTypes.length];
System.arraycopy(entityTypes, 0, mEntityTypes, 0, entityTypes.length);
return self();
@@ -587,7 +587,7 @@ public abstract class TextClassifierEvent implements Parcelable {
*/
@NonNull
public T setScores(@NonNull float... scores) {
Preconditions.checkNotNull(scores);
Objects.requireNonNull(scores);
mScores = new float[scores.length];
System.arraycopy(scores, 0, mScores, 0, scores.length);
return self();
@@ -652,7 +652,7 @@ public abstract class TextClassifierEvent implements Parcelable {
*/
@NonNull
public T setExtras(@NonNull Bundle extras) {
mExtras = Preconditions.checkNotNull(extras);
mExtras = Objects.requireNonNull(extras);
return self();
}

6
core/java/android/view/textclassifier/TextClassifierEventTronLogger.java
View File

@@ -29,7 +29,7 @@ import android.metrics.LogMaker;
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.Objects;
/**
@@ -50,12 +50,12 @@ public final class TextClassifierEventTronLogger {
@VisibleForTesting
public TextClassifierEventTronLogger(MetricsLogger metricsLogger) {
mMetricsLogger = Preconditions.checkNotNull(metricsLogger);
mMetricsLogger = Objects.requireNonNull(metricsLogger);
}
/** Emits a text classifier event to the logs. */
public void writeEvent(TextClassifierEvent event) {
Preconditions.checkNotNull(event);
Objects.requireNonNull(event);
int category = getCategory(event);
if (category == -1) {

16
core/java/android/view/textclassifier/TextClassifierImpl.java
View File

@@ -130,9 +130,9 @@ public final class TextClassifierImpl implements TextClassifier {
public TextClassifierImpl(
Context context, TextClassificationConstants settings, TextClassifier fallback) {
mContext = Preconditions.checkNotNull(context);
mFallback = Preconditions.checkNotNull(fallback);
mSettings = Preconditions.checkNotNull(settings);
mContext = Objects.requireNonNull(context);
mFallback = Objects.requireNonNull(fallback);
mSettings = Objects.requireNonNull(settings);
mGenerateLinksLogger = new GenerateLinksLogger(mSettings.getGenerateLinksLogSampleRate());
mAnnotatorModelFileManager = new ModelFileManager(
new ModelFileManager.ModelFileSupplierImpl(
@@ -180,7 +180,7 @@ public final class TextClassifierImpl implements TextClassifier {
@Override
@WorkerThread
public TextSelection suggestSelection(TextSelection.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
final int rangeLength = request.getEndIndex() - request.getStartIndex();
@@ -245,7 +245,7 @@ public final class TextClassifierImpl implements TextClassifier {
@Override
@WorkerThread
public TextClassification classifyText(TextClassification.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
final int rangeLength = request.getEndIndex() - request.getStartIndex();
@@ -285,7 +285,7 @@ public final class TextClassifierImpl implements TextClassifier {
@Override
@WorkerThread
public TextLinks generateLinks(@NonNull TextLinks.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkTextLength(request.getText(), getMaxGenerateLinksTextLength());
Utils.checkMainThread();
@@ -399,7 +399,7 @@ public final class TextClassifierImpl implements TextClassifier {
/** @inheritDoc */
@Override
public TextLanguage detectLanguage(@NonNull TextLanguage.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
final TextLanguage.Builder builder = new TextLanguage.Builder();
@@ -420,7 +420,7 @@ public final class TextClassifierImpl implements TextClassifier {
@Override
public ConversationActions suggestConversationActions(ConversationActions.Request request) {
Preconditions.checkNotNull(request);
Objects.requireNonNull(request);
Utils.checkMainThread();
try {
ActionsSuggestionsModel actionsImpl = getActionsImpl();

11
core/java/android/view/textclassifier/TextLinks.java
View File

@@ -48,6 +48,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
/**
@@ -155,7 +156,7 @@ public final class TextLinks implements Parcelable {
@NonNull Spannable text,
@ApplyStrategy int applyStrategy,
@Nullable Function<TextLink, TextLinkSpan> spanFactory) {
Preconditions.checkNotNull(text);
Objects.requireNonNull(text);
return new TextLinksParams.Builder()
.setApplyStrategy(applyStrategy)
.setSpanFactory(spanFactory)
@@ -223,10 +224,10 @@ public final class TextLinks implements Parcelable {
*/
private TextLink(int start, int end, @NonNull EntityConfidence entityConfidence,
@NonNull Bundle extras, @Nullable URLSpan urlSpan) {
Preconditions.checkNotNull(entityConfidence);
Objects.requireNonNull(entityConfidence);
Preconditions.checkArgument(!entityConfidence.getEntities().isEmpty());
Preconditions.checkArgument(start <= end);
Preconditions.checkNotNull(extras);
Objects.requireNonNull(extras);
mStart = start;
mEnd = end;
mEntityScores = entityConfidence;
@@ -455,7 +456,7 @@ public final class TextLinks implements Parcelable {
@Nullable private Bundle mExtras;
public Builder(@NonNull CharSequence text) {
mText = Preconditions.checkNotNull(text);
mText = Objects.requireNonNull(text);
}
/**
@@ -654,7 +655,7 @@ public final class TextLinks implements Parcelable {
* @param fullText The full text to annotate with links
*/
public Builder(@NonNull String fullText) {
mFullText = Preconditions.checkNotNull(fullText);
mFullText = Objects.requireNonNull(fullText);
mLinks = new ArrayList<>();
}

7
core/java/android/view/textclassifier/TextLinksParams.java
View File

@@ -25,10 +25,9 @@ import android.text.util.Linkify.LinkifyMask;
import android.view.textclassifier.TextLinks.TextLink;
import android.view.textclassifier.TextLinks.TextLinkSpan;
import com.android.internal.util.Preconditions;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
/**
@@ -103,8 +102,8 @@ public final class TextLinksParams {
*/
@TextLinks.Status
public int apply(@NonNull Spannable text, @NonNull TextLinks textLinks) {
Preconditions.checkNotNull(text);
Preconditions.checkNotNull(textLinks);
Objects.requireNonNull(text);
Objects.requireNonNull(textLinks);
final String textString = text.toString();

3
core/java/android/view/textclassifier/TextSelection.java
View File

@@ -36,6 +36,7 @@ import com.android.internal.util.Preconditions;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
/**
* Information about where text selection should be.
@@ -165,7 +166,7 @@ public final class TextSelection implements Parcelable {
public Builder setEntityType(
@NonNull @EntityType String type,
@FloatRange(from = 0.0, to = 1.0) float confidenceScore) {
Preconditions.checkNotNull(type);
Objects.requireNonNull(type);
mEntityConfidence.put(type, confidenceScore);
return this;
}

11
core/java/android/view/textclassifier/intent/LabeledIntent.java
View File

@@ -32,7 +32,8 @@ import android.view.textclassifier.TextClassification;
import android.view.textclassifier.TextClassifier;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
* Helper class to store the information from which RemoteActions are built.
@@ -86,9 +87,9 @@ public final class LabeledIntent {
}
this.titleWithoutEntity = titleWithoutEntity;
this.titleWithEntity = titleWithEntity;
this.description = Preconditions.checkNotNull(description);
this.description = Objects.requireNonNull(description);
this.descriptionWithAppName = descriptionWithAppName;
this.intent = Preconditions.checkNotNull(intent);
this.intent = Objects.requireNonNull(intent);
this.requestCode = requestCode;
}
@@ -198,8 +199,8 @@ public final class LabeledIntent {
public final RemoteAction remoteAction;
public Result(Intent resolvedIntent, RemoteAction remoteAction) {
this.resolvedIntent = Preconditions.checkNotNull(resolvedIntent);
this.remoteAction = Preconditions.checkNotNull(remoteAction);
this.resolvedIntent = Objects.requireNonNull(resolvedIntent);
this.remoteAction = Objects.requireNonNull(remoteAction);
}
}

5
core/java/android/view/textclassifier/intent/TemplateClassificationIntentFactory.java
View File

@@ -30,6 +30,7 @@ import com.google.android.textclassifier.RemoteActionTemplate;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
/**
* Creates intents based on {@link RemoteActionTemplate} objects for a ClassificationResult.
@@ -44,8 +45,8 @@ public final class TemplateClassificationIntentFactory implements Classification
public TemplateClassificationIntentFactory(TemplateIntentFactory templateIntentFactory,
ClassificationIntentFactory fallback) {
mTemplateIntentFactory = Preconditions.checkNotNull(templateIntentFactory);
mFallback = Preconditions.checkNotNull(fallback);
mTemplateIntentFactory = Objects.requireNonNull(templateIntentFactory);
mFallback = Objects.requireNonNull(fallback);
}
/**

10
core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java
View File

@@ -105,14 +105,14 @@ public final class SmartSelectionEventTracker {
public SmartSelectionEventTracker(@NonNull Context context, @WidgetType int widgetType) {
mWidgetType = widgetType;
mWidgetVersion = null;
mContext = Preconditions.checkNotNull(context);
mContext = Objects.requireNonNull(context);
}
public SmartSelectionEventTracker(
@NonNull Context context, @WidgetType int widgetType, @Nullable String widgetVersion) {
mWidgetType = widgetType;
mWidgetVersion = widgetVersion;
mContext = Preconditions.checkNotNull(context);
mContext = Objects.requireNonNull(context);
}
/**
@@ -122,7 +122,7 @@ public final class SmartSelectionEventTracker {
*/
@UnsupportedAppUsage(trackingBug = 136637107)
public void logEvent(@NonNull SelectionEvent event) {
Preconditions.checkNotNull(event);
Objects.requireNonNull(event);
if (event.mEventType != SelectionEvent.EventType.SELECTION_STARTED && mSessionId == null
&& DEBUG_LOG_ENABLED) {
@@ -435,8 +435,8 @@ public final class SmartSelectionEventTracker {
mStart = start;
mEnd = end;
mEventType = eventType;
mEntityType = Preconditions.checkNotNull(entityType);
mVersionTag = Preconditions.checkNotNull(versionTag);
mEntityType = Objects.requireNonNull(entityType);
mVersionTag = Objects.requireNonNull(versionTag);
}
/**