Merge "BUILDER, Y U @NON NULL?" (6c13d9bf) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −17

Original line number	Diff line number	Diff line
		@@ -41125,10 +41125,10 @@ package android.service.autofill {

		public static class CustomDescription.Builder {
		ctor public CustomDescription.Builder(@NonNull android.widget.RemoteViews);
		method public android.service.autofill.CustomDescription.Builder addChild(int, @NonNull android.service.autofill.Transformation);
		method public android.service.autofill.CustomDescription.Builder addOnClickAction(int, @NonNull android.service.autofill.OnClickAction);
		method public android.service.autofill.CustomDescription.Builder batchUpdate(@NonNull android.service.autofill.Validator, @NonNull android.service.autofill.BatchUpdates);
		method public android.service.autofill.CustomDescription build();
		method @NonNull public android.service.autofill.CustomDescription.Builder addChild(int, @NonNull android.service.autofill.Transformation);
		method @NonNull public android.service.autofill.CustomDescription.Builder addOnClickAction(int, @NonNull android.service.autofill.OnClickAction);
		method @NonNull public android.service.autofill.CustomDescription.Builder batchUpdate(@NonNull android.service.autofill.Validator, @NonNull android.service.autofill.BatchUpdates);
		method @NonNull public android.service.autofill.CustomDescription build();
		}

		public final class Dataset implements android.os.Parcelable {
		@@ -41233,17 +41233,17 @@ package android.service.autofill {
		public static final class FillResponse.Builder {
		ctor public FillResponse.Builder();
		method @NonNull public android.service.autofill.FillResponse.Builder addDataset(@Nullable android.service.autofill.Dataset);
		method public android.service.autofill.FillResponse build();
		method public android.service.autofill.FillResponse.Builder disableAutofill(long);
		method @NonNull public android.service.autofill.FillResponse build();
		method @NonNull public android.service.autofill.FillResponse.Builder disableAutofill(long);
		method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews);
		method public android.service.autofill.FillResponse.Builder setClientState(@Nullable android.os.Bundle);
		method public android.service.autofill.FillResponse.Builder setFieldClassificationIds(@NonNull android.view.autofill.AutofillId...);
		method public android.service.autofill.FillResponse.Builder setFlags(int);
		method public android.service.autofill.FillResponse.Builder setFooter(@NonNull android.widget.RemoteViews);
		method public android.service.autofill.FillResponse.Builder setHeader(@NonNull android.widget.RemoteViews);
		method public android.service.autofill.FillResponse.Builder setIgnoredIds(android.view.autofill.AutofillId...);
		method @NonNull public android.service.autofill.FillResponse.Builder setClientState(@Nullable android.os.Bundle);
		method @NonNull public android.service.autofill.FillResponse.Builder setFieldClassificationIds(@NonNull android.view.autofill.AutofillId...);
		method @NonNull public android.service.autofill.FillResponse.Builder setFlags(int);
		method @NonNull public android.service.autofill.FillResponse.Builder setFooter(@NonNull android.widget.RemoteViews);
		method @NonNull public android.service.autofill.FillResponse.Builder setHeader(@NonNull android.widget.RemoteViews);
		method @NonNull public android.service.autofill.FillResponse.Builder setIgnoredIds(android.view.autofill.AutofillId...);
		method @NonNull public android.service.autofill.FillResponse.Builder setSaveInfo(@NonNull android.service.autofill.SaveInfo);
		method public android.service.autofill.FillResponse.Builder setUserData(@NonNull android.service.autofill.UserData);
		method @NonNull public android.service.autofill.FillResponse.Builder setUserData(@NonNull android.service.autofill.UserData);
		}

		public final class ImageTransformation implements android.os.Parcelable android.service.autofill.Transformation {
		@@ -41352,10 +41352,10 @@ package android.service.autofill {

		public static final class UserData.Builder {
		ctor public UserData.Builder(@NonNull String, @NonNull String, @NonNull String);
		method public android.service.autofill.UserData.Builder add(@NonNull String, @NonNull String);
		method public android.service.autofill.UserData build();
		method public android.service.autofill.UserData.Builder setFieldClassificationAlgorithm(@Nullable String, @Nullable android.os.Bundle);
		method public android.service.autofill.UserData.Builder setFieldClassificationAlgorithmForCategory(@NonNull String, @Nullable String, @Nullable android.os.Bundle);
		method @NonNull public android.service.autofill.UserData.Builder add(@NonNull String, @NonNull String);
		method @NonNull public android.service.autofill.UserData build();
		method @NonNull public android.service.autofill.UserData.Builder setFieldClassificationAlgorithm(@Nullable String, @Nullable android.os.Bundle);
		method @NonNull public android.service.autofill.UserData.Builder setFieldClassificationAlgorithmForCategory(@NonNull String, @Nullable String, @Nullable android.os.Bundle);
		}

		public interface Validator {

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ public final class CustomDescription implements Parcelable {
		* by the Android System.
		* @throws IllegalStateException if {@link #build()} was already called.
		*/
		@NonNull
		public Builder addChild(int id, @NonNull Transformation transformation) {
		throwIfDestroyed();
		Preconditions.checkArgument((transformation instanceof InternalTransformation),
		@@ -270,6 +271,7 @@ public final class CustomDescription implements Parcelable {
		* by the Android System.
		* @throws IllegalStateException if {@link #build()} was already called.
		*/
		@NonNull
		public Builder batchUpdate(@NonNull Validator condition, @NonNull BatchUpdates updates) {
		throwIfDestroyed();
		Preconditions.checkArgument((condition instanceof InternalValidator),
		@@ -323,6 +325,7 @@ public final class CustomDescription implements Parcelable {
		* by the Android System.
		* @throws IllegalStateException if {@link #build()} was already called.
		*/
		@NonNull
		public Builder addOnClickAction(int id, @NonNull OnClickAction action) {
		throwIfDestroyed();
		Preconditions.checkArgument((action instanceof InternalOnClickAction),
		@@ -338,6 +341,7 @@ public final class CustomDescription implements Parcelable {
		/**
		* Creates a new {@link CustomDescription} instance.
		*/
		@NonNull
		public CustomDescription build() {
		throwIfDestroyed();
		mDestroyed = true;

core/java/android/service/autofill/FillResponse.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -272,7 +272,8 @@ public final class FillResponse implements Parcelable {
		*
		* @see android.app.PendingIntent#getIntentSender()
		*/
		public @NonNull Builder setAuthentication(@NonNull AutofillId[] ids,
		@NonNull
		public Builder setAuthentication(@NonNull AutofillId[] ids,
		@Nullable IntentSender authentication, @Nullable RemoteViews presentation) {
		throwIfDestroyed();
		throwIfDisableAutofillCalled();
		@@ -298,6 +299,7 @@ public final class FillResponse implements Parcelable {
		* <p>This is typically used when the service cannot autofill the view; for example, a
		* text field representing the result of a Captcha challenge.
		*/
		@NonNull
		public Builder setIgnoredIds(AutofillId...ids) {
		throwIfDestroyed();
		mIgnoredIds = ids;
		@@ -318,7 +320,8 @@ public final class FillResponse implements Parcelable {
		*
		* @return This builder.
		*/
		public @NonNull Builder addDataset(@Nullable Dataset dataset) {
		@NonNull
		public Builder addDataset(@Nullable Dataset dataset) {
		throwIfDestroyed();
		throwIfDisableAutofillCalled();
		if (dataset == null) {
		@@ -359,6 +362,7 @@ public final class FillResponse implements Parcelable {
		* @param clientState The custom client state.
		* @return This builder.
		*/
		@NonNull
		public Builder setClientState(@Nullable Bundle clientState) {
		throwIfDestroyed();
		throwIfDisableAutofillCalled();
		@@ -379,6 +383,7 @@ public final class FillResponse implements Parcelable {
		* already called.
		* @throws NullPointerException if {@code ids} or any element on it is {@code null}.
		*/
		@NonNull
		public Builder setFieldClassificationIds(@NonNull AutofillId... ids) {
		throwIfDestroyed();
		throwIfDisableAutofillCalled();
		@@ -398,6 +403,7 @@ public final class FillResponse implements Parcelable {
		*
		* @return This builder.
		*/
		@NonNull
		public Builder setFlags(@FillResponseFlags int flags) {
		throwIfDestroyed();
		mFlags = Preconditions.checkFlagsArgument(flags,
		@@ -437,6 +443,7 @@ public final class FillResponse implements Parcelable {
		* {@link #setSaveInfo(SaveInfo)}, {@link #setClientState(Bundle)}, or
		* {@link #setFieldClassificationIds(AutofillId...)} was already called.
		*/
		@NonNull
		public Builder disableAutofill(long duration) {
		throwIfDestroyed();
		if (duration <= 0) {
		@@ -475,6 +482,7 @@ public final class FillResponse implements Parcelable {
		* already set for this builder.
		*/
		// TODO(b/69796626): make it sticky / update javadoc
		@NonNull
		public Builder setHeader(@NonNull RemoteViews header) {
		throwIfDestroyed();
		throwIfAuthenticationCalled();
		@@ -506,6 +514,7 @@ public final class FillResponse implements Parcelable {
		* requires authentication}.
		*/
		// TODO(b/69796626): make it sticky / update javadoc
		@NonNull
		public Builder setFooter(@NonNull RemoteViews footer) {
		throwIfDestroyed();
		throwIfAuthenticationCalled();
		@@ -524,6 +533,7 @@ public final class FillResponse implements Parcelable {
		* {@link #setAuthentication(AutofillId[], IntentSender, RemoteViews)
		* requires authentication}.
		*/
		@NonNull
		public Builder setUserData(@NonNull UserData userData) {
		throwIfDestroyed();
		throwIfAuthenticationCalled();
		@@ -548,6 +558,7 @@ public final class FillResponse implements Parcelable {
		*
		* @return A built response.
		*/
		@NonNull
		public FillResponse build() {
		throwIfDestroyed();
		if (mAuthentication == null && mDatasets == null && mSaveInfo == null

core/java/android/service/autofill/UserData.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,7 @@ public final class UserData implements FieldClassificationUserData, Parcelable {
		*
		* @return this builder
		*/
		@NonNull
		public Builder setFieldClassificationAlgorithm(@Nullable String name,
		@Nullable Bundle args) {
		throwIfDestroyed();
		@@ -291,6 +292,7 @@ public final class UserData implements FieldClassificationUserData, Parcelable {
		*
		* @return this builder
		*/
		@NonNull
		public Builder setFieldClassificationAlgorithmForCategory(@NonNull String categoryId,
		@Nullable String name, @Nullable Bundle args) {
		throwIfDestroyed();
		@@ -333,6 +335,7 @@ public final class UserData implements FieldClassificationUserData, Parcelable {
		* {@link UserData#getMaxValueLength()}</li>
		* </ul>
		*/
		@NonNull
		public Builder add(@NonNull String value, @NonNull String categoryId) {
		throwIfDestroyed();
		checkNotEmpty("categoryId", categoryId);
		@@ -386,6 +389,7 @@ public final class UserData implements FieldClassificationUserData, Parcelable {
		*
		* @return The built dataset.
		*/
		@NonNull
		public UserData build() {
		throwIfDestroyed();
		mDestroyed = true;

core/java/android/service/autofill/augmented/AugmentedAutofillService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ public abstract class AugmentedAutofillService extends Service {
		}

		@Override
		/** @hide */
		protected final void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (mAutofillProxies != null) {
		final int size = mAutofillProxies.size();