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

Revert "API to allow Autofill Providers to give detection result..."

Browse Source 
Revert submission 21047830-autofill-pcc-apis

Reason for revert: Crashes IMEs

Reverted changes: /q/submissionid:21047830-autofill-pcc-apis

Change-Id: I5566ef4fed6aaa7c56becec852054da53dc6dc95
Fixes: 268303940
Bug: 261106877
This commit is contained in:
Adrian Roos
2023-02-08 13:28:48 +00:00
parent 7f04fad0e6
commit e8c0dc5403
3 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -39613,7 +39613,6 @@ package android.service.autofill {
method @Deprecated @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews, @Nullable android.service.autofill.InlinePresentation, @Nullable android.service.autofill.InlinePresentation);
method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.service.autofill.Presentations);
method @NonNull public android.service.autofill.FillResponse.Builder setClientState(@Nullable android.os.Bundle);
method @NonNull public android.service.autofill.FillResponse.Builder setDetectedFieldClassifications(@NonNull java.util.Set<android.service.assist.classification.FieldClassification>);
method @NonNull public android.service.autofill.FillResponse.Builder setDialogHeader(@NonNull android.widget.RemoteViews);
method @NonNull public android.service.autofill.FillResponse.Builder setFieldClassificationIds(@NonNull android.view.autofill.AutofillId...);
method @NonNull public android.service.autofill.FillResponse.Builder setFillDialogTriggerIds(@NonNull android.view.autofill.AutofillId...);

1
core/api/test-current.txt
View File

@@ -2550,7 +2550,6 @@ package android.service.autofill {
}
public final class FillResponse implements android.os.Parcelable {
method @NonNull public java.util.Set<android.service.assist.classification.FieldClassification> getDetectedFieldClassifications();
method public int getFlags();
}

40
core/java/android/service/autofill/FillResponse.java
View File

@@ -34,7 +34,6 @@ import android.content.pm.ParceledListSlice;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.service.assist.classification.FieldClassification;
import android.view.autofill.AutofillId;
import android.widget.RemoteViews;
@@ -46,7 +45,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
* Response for an {@link
@@ -115,7 +113,6 @@ public final class FillResponse implements Parcelable {
private final @StringRes int mServiceDisplayNameResourceId;
private final boolean mShowFillDialogIcon;
private final boolean mShowSaveDialogIcon;
private final @Nullable FieldClassification[] mDetectedFieldTypes;
private FillResponse(@NonNull Builder builder) {
mDatasets = (builder.mDatasets != null) ? new ParceledListSlice<>(builder.mDatasets) : null;
@@ -143,14 +140,6 @@ public final class FillResponse implements Parcelable {
mServiceDisplayNameResourceId = builder.mServiceDisplayNameResourceId;
mShowFillDialogIcon = builder.mShowFillDialogIcon;
mShowSaveDialogIcon = builder.mShowSaveDialogIcon;
mDetectedFieldTypes = builder.mDetectedFieldTypes;
}
/** @hide */
@TestApi
@NonNull
public Set<FieldClassification> getDetectedFieldClassifications() {
return Set.of(mDetectedFieldTypes);
}
/** @hide */
@@ -323,28 +312,6 @@ public final class FillResponse implements Parcelable {
private int mServiceDisplayNameResourceId;
private boolean mShowFillDialogIcon = true;
private boolean mShowSaveDialogIcon = true;
private FieldClassification[] mDetectedFieldTypes;
/**
* Adds a new {@link FieldClassification} to this response, to
* help the platform provide more accurate detection results.
*
* Call this when a field has been detected with a type.
*
* Altough similiarly named with {@link setFieldClassificationIds},
* it provides a different functionality - setFieldClassificationIds should
* be used when a field is only suspected to be Autofillable.
* This method should be used when a field is certainly Autofillable
* with a certain type.
*/
@NonNull
public Builder setDetectedFieldClassifications(
@NonNull Set<FieldClassification> fieldInfos) {
throwIfDestroyed();
throwIfDisableAutofillCalled();
mDetectedFieldTypes = fieldInfos.toArray(new FieldClassification[0]);
return this;
}
/**
* Triggers a custom UI before autofilling the screen with any data set in this
@@ -1155,7 +1122,6 @@ public final class FillResponse implements Parcelable {
parcel.writeParcelableArray(mIgnoredIds, flags);
parcel.writeLong(mDisableDuration);
parcel.writeParcelableArray(mFieldClassificationIds, flags);
parcel.writeParcelableArray(mDetectedFieldTypes, flags);
parcel.writeInt(mIconResourceId);
parcel.writeInt(mServiceDisplayNameResourceId);
parcel.writeBoolean(mShowFillDialogIcon);
@@ -1226,12 +1192,6 @@ public final class FillResponse implements Parcelable {
builder.setFieldClassificationIds(fieldClassifactionIds);
}
final FieldClassification[] detectedFields =
parcel.readParcelableArray(null, FieldClassification.class);
if (detectedFields != null) {
builder.setDetectedFieldClassifications(Set.of(detectedFields));
}
builder.setIconResourceId(parcel.readInt());
builder.setServiceDisplayNameResourceId(parcel.readInt());
builder.setShowFillDialogIcon(parcel.readBoolean());