Merge "Fix dropdown more options bug" into main (635ede2a) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -588,6 +588,9 @@ public final class AutofillManager {
		*/
		public static final int NO_SESSION = Integer.MAX_VALUE;

		/ @hide /
		public static final String PINNED_DATASET_ID = "PINNED_DATASET_ID";

		private final IAutoFillManager mService;

		private final Object mLock = new Object();

+3 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import android.service.credentials.CredentialProviderService
		import android.util.Log
		import android.content.Intent
		import android.view.autofill.AutofillId
		import android.view.autofill.AutofillManager
		import android.view.autofill.IAutoFillManagerClient
		import android.widget.RemoteViews
		import android.widget.inline.InlinePresentationSpec
		@@ -372,6 +373,7 @@ class CredentialAutofillService : AutofillService() {

		fillResponseBuilder.addDataset(
		Dataset.Builder()
		.setId(AutofillManager.PINNED_DATASET_ID)
		.setField(
		autofillId,
		Field.Builder().setPresentations(
		@@ -411,6 +413,7 @@ class CredentialAutofillService : AutofillService() {

		fillResponseBuilder.addDataset(
		dataSetBuilder
		.setId(AutofillManager.PINNED_DATASET_ID)
		.setField(
		autofillId,
		Field.Builder().setPresentations(

+2 −1

Original line number	Diff line number	Diff line
		@@ -5141,7 +5141,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		return;
		}
		for (Dataset dataset: response.getDatasets()) {
		if (isPinnedDataset(dataset)) {
		if (dataset.getId() != null
		&& dataset.getId().equals(AutofillManager.PINNED_DATASET_ID)) {
		Slog.d(TAG, "Adding Credential Manager callback to a pinned entry");
		addCredentialManagerCallbackForDataset(dataset, response.getRequestId());
		}