Merge "Use a separate code path for rich content in augmented autofill" (909bb8a0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10032,6 +10032,7 @@ package android.service.autofill {

		public static final class Dataset.Builder {
		ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation);
		method @NonNull public android.service.autofill.Dataset.Builder setContent(@NonNull android.view.autofill.AutofillId, @Nullable android.content.ClipData);
		method @NonNull public android.service.autofill.Dataset.Builder setFieldInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation);
		}

api/test-current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -1556,6 +1556,19 @@ package android.service.autofill {
		method @Nullable public android.util.SparseArray<android.service.autofill.InternalOnClickAction> getActions();
		}

		public final class Dataset implements android.os.Parcelable {
		method @Nullable public android.content.IntentSender getAuthentication();
		method @Nullable public android.content.ClipData getFieldContent();
		method @Nullable public java.util.ArrayList<android.view.autofill.AutofillId> getFieldIds();
		method @Nullable public java.util.ArrayList<android.view.autofill.AutofillValue> getFieldValues();
		method @Nullable public String getId();
		method public boolean isEmpty();
		}

		public static final class Dataset.Builder {
		method @NonNull public android.service.autofill.Dataset.Builder setContent(@NonNull android.view.autofill.AutofillId, @Nullable android.content.ClipData);
		}

		public final class DateTransformation extends android.service.autofill.InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation {
		method public void apply(@NonNull android.service.autofill.ValueFinder, @NonNull android.widget.RemoteViews, int) throws java.lang.Exception;
		}

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

+89 −18

Original line number	Diff line number	Diff line
		@@ -20,7 +20,10 @@ import static android.view.autofill.Helper.sDebug;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.ClipData;
		import android.content.IntentSender;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -97,7 +100,6 @@ import java.util.regex.Pattern;
		* with the lower case value of the view's text are shown.
		* <li>All other datasets are hidden.
		* </ol>
		*
		*/
		public final class Dataset implements Parcelable {

		@@ -106,6 +108,7 @@ public final class Dataset implements Parcelable {
		private final ArrayList<RemoteViews> mFieldPresentations;
		private final ArrayList<InlinePresentation> mFieldInlinePresentations;
		private final ArrayList<DatasetFieldFilter> mFieldFilters;
		@Nullable private final ClipData mFieldContent;
		private final RemoteViews mPresentation;
		@Nullable private final InlinePresentation mInlinePresentation;
		private final IntentSender mAuthentication;
		@@ -117,6 +120,7 @@ public final class Dataset implements Parcelable {
		mFieldPresentations = builder.mFieldPresentations;
		mFieldInlinePresentations = builder.mFieldInlinePresentations;
		mFieldFilters = builder.mFieldFilters;
		mFieldContent = builder.mFieldContent;
		mPresentation = builder.mPresentation;
		mInlinePresentation = builder.mInlinePresentation;
		mAuthentication = builder.mAuthentication;
		@@ -124,11 +128,15 @@ public final class Dataset implements Parcelable {
		}

		/** @hide */
		@TestApi
		@SuppressLint("ConcreteCollection")
		public @Nullable ArrayList<AutofillId> getFieldIds() {
		return mFieldIds;
		}

		/** @hide */
		@TestApi
		@SuppressLint("ConcreteCollection")
		public @Nullable ArrayList<AutofillValue> getFieldValues() {
		return mFieldValues;
		}
		@@ -140,24 +148,37 @@ public final class Dataset implements Parcelable {
		}

		/** @hide */
		@Nullable
		public InlinePresentation getFieldInlinePresentation(int index) {
		public @Nullable InlinePresentation getFieldInlinePresentation(int index) {
		final InlinePresentation inlinePresentation = mFieldInlinePresentations.get(index);
		return inlinePresentation != null ? inlinePresentation : mInlinePresentation;
		}

		/** @hide */
		@Nullable
		public DatasetFieldFilter getFilter(int index) {
		public @Nullable DatasetFieldFilter getFilter(int index) {
		return mFieldFilters.get(index);
		}

		/**
		* Returns the content to be filled for a non-text suggestion. This is only applicable to
		* augmented autofill. The target field for the content is available via {@link #getFieldIds()}
		* (guaranteed to have a single field id set when the return value here is non-null). See
		* {@link Builder#setContent(AutofillId, ClipData)} for more info.
		*
		* @hide
		*/
		@TestApi
		public @Nullable ClipData getFieldContent() {
		return mFieldContent;
		}

		/** @hide */
		@TestApi
		public @Nullable IntentSender getAuthentication() {
		return mAuthentication;
		}

		/** @hide */
		@TestApi
		public boolean isEmpty() {
		return mFieldIds == null \|\| mFieldIds.isEmpty();
		}
		@@ -179,6 +200,9 @@ public final class Dataset implements Parcelable {
		if (mFieldValues != null) {
		builder.append(", fieldValues=").append(mFieldValues);
		}
		if (mFieldContent != null) {
		builder.append(", fieldContent=").append(mFieldContent);
		}
		if (mFieldPresentations != null) {
		builder.append(", fieldPresentations=").append(mFieldPresentations.size());
		}
		@@ -207,7 +231,8 @@ public final class Dataset implements Parcelable {
		*
		* @hide
		*/
		public String getId() {
		@TestApi
		public @Nullable String getId() {
		return mId;
		}

		@@ -221,6 +246,7 @@ public final class Dataset implements Parcelable {
		private ArrayList<RemoteViews> mFieldPresentations;
		private ArrayList<InlinePresentation> mFieldInlinePresentations;
		private ArrayList<DatasetFieldFilter> mFieldFilters;
		@Nullable private ClipData mFieldContent;
		private RemoteViews mPresentation;
		@Nullable private InlinePresentation mInlinePresentation;
		private IntentSender mAuthentication;
		@@ -365,6 +391,36 @@ public final class Dataset implements Parcelable {
		return this;
		}

		/**
		* Sets the content for a field.
		*
		* <p>Only called by augmented autofill.
		*
		* <p>For a given field, either a {@link AutofillValue value} or content can be filled, but
		* not both. Furthermore, when filling content, only a single field can be filled.
		*
		* @param id id returned by
		* {@link android.app.assist.AssistStructure.ViewNode#getAutofillId()}.
		* @param content content to be autofilled. Pass {@code null} if you do not have the content
		* but the target view is a logical part of the dataset. For example, if the dataset needs
		* authentication.
		*
		* @throws IllegalStateException if {@link #build()} was already called.
		*
		* @return this builder.
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		@SuppressLint("MissingGetterMatchingBuilder")
		public @NonNull Builder setContent(@NonNull AutofillId id, @Nullable ClipData content) {
		throwIfDestroyed();
		setLifeTheUniverseAndEverything(id, null, null, null, null);
		mFieldContent = content;
		return this;
		}

		/**
		* Sets the value of a field.
		*
		@@ -659,6 +715,15 @@ public final class Dataset implements Parcelable {
		if (mFieldIds == null) {
		throw new IllegalStateException("at least one value must be set");
		}
		if (mFieldContent != null) {
		if (mFieldIds.size() > 1) {
		throw new IllegalStateException(
		"when filling content, only one field can be filled");
		}
		if (mFieldValues.get(0) != null) {
		throw new IllegalStateException("cannot fill both content and values");
		}
		}
		return new Dataset(this);
		}

		@@ -687,6 +752,7 @@ public final class Dataset implements Parcelable {
		parcel.writeTypedList(mFieldPresentations, flags);
		parcel.writeTypedList(mFieldInlinePresentations, flags);
		parcel.writeTypedList(mFieldFilters, flags);
		parcel.writeParcelable(mFieldContent, flags);
		parcel.writeParcelable(mAuthentication, flags);
		parcel.writeString(mId);
		}
		@@ -694,18 +760,8 @@ public final class Dataset implements Parcelable {
		public static final @NonNull Creator<Dataset> CREATOR = new Creator<Dataset>() {
		@Override
		public Dataset createFromParcel(Parcel parcel) {
		// Always go through the builder to ensure the data ingested by
		// the system obeys the contract of the builder to avoid attacks
		// using specially crafted parcels.
		final RemoteViews presentation = parcel.readParcelable(null);
		final InlinePresentation inlinePresentation = parcel.readParcelable(null);
		final Builder builder = presentation != null
		? inlinePresentation == null
		? new Builder(presentation)
		: new Builder(presentation).setInlinePresentation(inlinePresentation)
		: inlinePresentation == null
		? new Builder()
		: new Builder(inlinePresentation);
		final ArrayList<AutofillId> ids =
		parcel.createTypedArrayList(AutofillId.CREATOR);
		final ArrayList<AutofillValue> values =
		@@ -716,6 +772,21 @@ public final class Dataset implements Parcelable {
		parcel.createTypedArrayList(InlinePresentation.CREATOR);
		final ArrayList<DatasetFieldFilter> filters =
		parcel.createTypedArrayList(DatasetFieldFilter.CREATOR);
		final ClipData fieldContent = parcel.readParcelable(null);
		final IntentSender authentication = parcel.readParcelable(null);
		final String datasetId = parcel.readString();

		// Always go through the builder to ensure the data ingested by
		// the system obeys the contract of the builder to avoid attacks
		// using specially crafted parcels.
		final Builder builder = (presentation != null) ? new Builder(presentation)
		: new Builder();
		if (inlinePresentation != null) {
		builder.setInlinePresentation(inlinePresentation);
		}
		if (fieldContent != null) {
		builder.setContent(ids.get(0), fieldContent);
		}
		final int inlinePresentationsSize = inlinePresentations.size();
		for (int i = 0; i < ids.size(); i++) {
		final AutofillId id = ids.get(i);
		@@ -727,8 +798,8 @@ public final class Dataset implements Parcelable {
		builder.setLifeTheUniverseAndEverything(id, value, fieldPresentation,
		fieldInlinePresentation, filter);
		}
		builder.setAuthentication(parcel.readParcelable(null));
		builder.setId(parcel.readString());
		builder.setAuthentication(authentication);
		builder.setId(datasetId);
		return builder.build();
		}

core/java/android/view/autofill/AutofillManager.java

+54 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.view.autofill;
		import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;
		import static android.service.autofill.FillRequest.FLAG_PASSWORD_INPUT_TYPE;
		import static android.service.autofill.FillRequest.FLAG_VIEW_NOT_FOCUSED;
		import static android.view.OnReceiveContentCallback.Payload.SOURCE_AUTOFILL;
		import static android.view.autofill.Helper.sDebug;
		import static android.view.autofill.Helper.sVerbose;
		import static android.view.autofill.Helper.toList;
		@@ -32,6 +33,7 @@ import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.content.AutofillOptions;
		import android.content.ClipData;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -60,6 +62,7 @@ import android.util.Slog;
		import android.util.SparseArray;
		import android.view.Choreographer;
		import android.view.KeyEvent;
		import android.view.OnReceiveContentCallback;
		import android.view.View;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityManager;
		@@ -2350,6 +2353,49 @@ public final class AutofillManager {
		}
		}

		private void autofillContent(int sessionId, AutofillId id, ClipData clip) {
		synchronized (mLock) {
		if (sessionId != mSessionId) {
		return;
		}
		final AutofillClient client = getClient();
		if (client == null) {
		return;
		}
		final View view = client.autofillClientFindViewByAutofillIdTraversal(id);
		if (view == null) {
		// Most likely view has been removed after the initial request was sent to the
		// the service; this is fine, but we need to update the view status in the
		// server side so it can be triggered again.
		Log.d(TAG, "autofillContent(): no view with id " + id);
		reportAutofillContentFailure(id);
		return;
		}
		OnReceiveContentCallback.Payload payload =
		new OnReceiveContentCallback.Payload.Builder(clip, SOURCE_AUTOFILL)
		.build();
		boolean handled = view.onReceiveContent(payload);
		if (!handled) {
		Log.w(TAG, "autofillContent(): receiver returned false: id=" + id
		+ ", view=" + view + ", clip=" + clip);
		reportAutofillContentFailure(id);
		return;
		}
		mMetricsLogger.write(newLog(MetricsEvent.AUTOFILL_DATASET_APPLIED)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_VALUES, 1)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_VIEWS_FILLED, 1));
		}
		}

		private void reportAutofillContentFailure(AutofillId id) {
		try {
		mService.setAutofillFailure(mSessionId, Collections.singletonList(id),
		mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private LogMaker newLog(int category) {
		final LogMaker log = new LogMaker(category)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, mSessionId);
		@@ -3390,6 +3436,14 @@ public final class AutofillManager {
		}
		}

		@Override
		public void autofillContent(int sessionId, AutofillId id, ClipData content) {
		final AutofillManager afm = mAfm.get();
		if (afm != null) {
		afm.post(() -> afm.autofillContent(sessionId, id, content));
		}
		}

		@Override
		public void authenticate(int sessionId, int authenticationId, IntentSender intent,
		Intent fillInIntent, boolean authenticateInline) {

core/java/android/view/autofill/IAutoFillManagerClient.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.view.autofill;

		import java.util.List;

		import android.content.ClipData;
		import android.content.ComponentName;
		import android.content.Intent;
		import android.content.IntentSender;
		@@ -47,6 +48,11 @@ oneway interface IAutoFillManagerClient {
		void autofill(int sessionId, in List<AutofillId> ids, in List<AutofillValue> values,
		boolean hideHighlight);

		/**
		* Autofills the activity with rich content data (e.g. an image) from a dataset.
		*/
		void autofillContent(int sessionId, in AutofillId id, in ClipData content);

		/**
		* Authenticates a fill response or a data set.
		*/