Merge "Update deprecated Preconditions.checkNotNull with Objects.requireNonNull." (fd76d1da) · Commits · e / os / android_frameworks_base

core/java/android/service/autofill/BatchUpdates.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.widget.RemoteViews;
		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;
		import java.util.Objects;

		/**
		* Defines actions to be applied to a {@link RemoteViews template presentation}.
		@@ -94,7 +95,7 @@ public final class BatchUpdates implements Parcelable {
		*/
		public Builder updateTemplate(@NonNull RemoteViews updates) {
		throwIfDestroyed();
		mUpdates = Preconditions.checkNotNull(updates);
		mUpdates = Objects.requireNonNull(updates);
		return this;
		}

core/java/android/service/autofill/CharSequenceTransformation.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.android.internal.util.Preconditions;

		import java.util.LinkedHashMap;
		import java.util.Map.Entry;
		import java.util.Objects;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		@@ -147,9 +148,9 @@ public final class CharSequenceTransformation extends InternalTransformation imp
		public Builder addField(@NonNull AutofillId id, @NonNull Pattern regex,
		@NonNull String subst) {
		throwIfDestroyed();
		Preconditions.checkNotNull(id);
		Preconditions.checkNotNull(regex);
		Preconditions.checkNotNull(subst);
		Objects.requireNonNull(id);
		Objects.requireNonNull(regex);
		Objects.requireNonNull(subst);

		mFields.put(id, new Pair<>(regex, subst));
		return this;

core/java/android/service/autofill/CompositeUserData.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -25,10 +25,9 @@ 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.Objects;

		/**
		* Holds both a generic and package-specific userData used for
		@@ -103,7 +102,7 @@ public final class CompositeUserData implements FieldClassificationUserData, Par
		@Nullable
		@Override
		public String getFieldClassificationAlgorithmForCategory(@NonNull String categoryId) {
		Preconditions.checkNotNull(categoryId);
		Objects.requireNonNull(categoryId);
		final ArrayMap<String, String> categoryAlgorithms = getFieldClassificationAlgorithms();
		if (categoryAlgorithms == null \|\| !categoryAlgorithms.containsKey(categoryId)) {
		return null;

core/java/android/service/autofill/CustomDescription.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.widget.RemoteViews;
		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;
		import java.util.Objects;

		/**
		* Defines a custom description for the autofill save UI.
		@@ -157,7 +158,7 @@ public final class CustomDescription implements Parcelable {
		* {@link android.os.Build.VERSION_CODES#P} or higher).
		*/
		public Builder(@NonNull RemoteViews parentPresentation) {
		mPresentation = Preconditions.checkNotNull(parentPresentation);
		mPresentation = Objects.requireNonNull(parentPresentation);
		}

		/**
		@@ -276,7 +277,7 @@ public final class CustomDescription implements Parcelable {
		throwIfDestroyed();
		Preconditions.checkArgument((condition instanceof InternalValidator),
		"not provided by Android System: %s", condition);
		Preconditions.checkNotNull(updates);
		Objects.requireNonNull(updates);
		if (mUpdates == null) {
		mUpdates = new ArrayList<>();
		}

core/java/android/service/autofill/Dataset.java

+20 −19

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.widget.RemoteViews;
		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;
		import java.util.Objects;
		import java.util.regex.Pattern;

		/**
		@@ -280,7 +281,7 @@ public final class Dataset implements Parcelable {
		* @param presentation The presentation used to visualize this dataset.
		*/
		public Builder(@NonNull RemoteViews presentation) {
		Preconditions.checkNotNull(presentation, "presentation must be non-null");
		Objects.requireNonNull(presentation, "presentation must be non-null");
		mPresentation = presentation;
		}

		@@ -296,7 +297,7 @@ public final class Dataset implements Parcelable {
		*/
		@SystemApi
		public Builder(@NonNull InlinePresentation inlinePresentation) {
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation must be non-null");
		mInlinePresentation = inlinePresentation;
		}

		@@ -321,7 +322,7 @@ public final class Dataset implements Parcelable {
		public @NonNull Builder setInlinePresentation(
		@NonNull InlinePresentation inlinePresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation must be non-null");
		mInlinePresentation = inlinePresentation;
		return this;
		}
		@@ -343,8 +344,8 @@ public final class Dataset implements Parcelable {
		@NonNull InlinePresentation inlinePresentation,
		@NonNull InlinePresentation inlineTooltipPresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null");
		Preconditions.checkNotNull(inlineTooltipPresentation,
		Objects.requireNonNull(inlinePresentation, "inlinePresentation must be non-null");
		Objects.requireNonNull(inlineTooltipPresentation,
		"inlineTooltipPresentation must be non-null");
		mInlinePresentation = inlinePresentation;
		mInlineTooltipPresentation = inlineTooltipPresentation;
		@@ -540,7 +541,7 @@ public final class Dataset implements Parcelable {
		public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value,
		@NonNull RemoteViews presentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(presentation, "presentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, null, null);
		return this;
		}
		@@ -613,7 +614,7 @@ public final class Dataset implements Parcelable {
		public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value,
		@Nullable Pattern filter, @NonNull RemoteViews presentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(presentation, "presentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, null,
		new DatasetFieldFilter(filter));
		return this;
		@@ -644,8 +645,8 @@ public final class Dataset implements Parcelable {
		public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value,
		@NonNull RemoteViews presentation, @NonNull InlinePresentation inlinePresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation cannot be null");
		Objects.requireNonNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, inlinePresentation, null);
		return this;
		}
		@@ -676,9 +677,9 @@ public final class Dataset implements Parcelable {
		@NonNull RemoteViews presentation, @NonNull InlinePresentation inlinePresentation,
		@NonNull InlinePresentation inlineTooltipPresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation cannot be null");
		Preconditions.checkNotNull(inlineTooltipPresentation,
		Objects.requireNonNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation cannot be null");
		Objects.requireNonNull(inlineTooltipPresentation,
		"inlineTooltipPresentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, inlinePresentation,
		inlineTooltipPresentation, null);
		@@ -722,8 +723,8 @@ public final class Dataset implements Parcelable {
		@Nullable Pattern filter, @NonNull RemoteViews presentation,
		@NonNull InlinePresentation inlinePresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation cannot be null");
		Objects.requireNonNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, inlinePresentation,
		new DatasetFieldFilter(filter));
		return this;
		@@ -761,9 +762,9 @@ public final class Dataset implements Parcelable {
		@NonNull InlinePresentation inlinePresentation,
		@NonNull InlinePresentation inlineTooltipPresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(presentation, "presentation cannot be null");
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation cannot be null");
		Preconditions.checkNotNull(inlineTooltipPresentation,
		Objects.requireNonNull(presentation, "presentation cannot be null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation cannot be null");
		Objects.requireNonNull(inlineTooltipPresentation,
		"inlineTooltipPresentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, presentation, inlinePresentation,
		inlineTooltipPresentation, new DatasetFieldFilter(filter));
		@@ -800,7 +801,7 @@ public final class Dataset implements Parcelable {
		@Nullable AutofillValue value, @Nullable Pattern filter,
		@NonNull InlinePresentation inlinePresentation) {
		throwIfDestroyed();
		Preconditions.checkNotNull(inlinePresentation, "inlinePresentation cannot be null");
		Objects.requireNonNull(inlinePresentation, "inlinePresentation cannot be null");
		setLifeTheUniverseAndEverything(id, value, null, inlinePresentation,
		new DatasetFieldFilter(filter));
		return this;
		@@ -819,7 +820,7 @@ public final class Dataset implements Parcelable {
		@Nullable InlinePresentation inlinePresentation,
		@Nullable InlinePresentation tooltip,
		@Nullable DatasetFieldFilter filter) {
		Preconditions.checkNotNull(id, "id cannot be null");
		Objects.requireNonNull(id, "id cannot be null");
		if (mFieldIds != null) {
		final int existingIdx = mFieldIds.indexOf(id);
		if (existingIdx >= 0) {