Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fecd30cf authored by Reema Bajwa's avatar Reema Bajwa
Browse files

Fix dropdown more options bug 

Bug: 328387993
Test: Cts

Change-Id: I2313160c8c2abd0f7fef090382fb0e70a99eb971
parent df3fda0a

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -588,6 +588,9 @@ public final class AutofillManager { 
     */

     */

    public static final int NO_SESSION = Integer.MAX_VALUE;

    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 IAutoFillManager mService;





    private final Object mLock = new Object();

    private final Object mLock = new Object();

packages/CredentialManager/src/com/android/credentialmanager/autofill/CredentialAutofillService.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import android.service.credentials.CredentialProviderService 
import android.util.Log

import android.util.Log

import android.content.Intent

import android.content.Intent

import android.view.autofill.AutofillId

import android.view.autofill.AutofillId

import android.view.autofill.AutofillManager

import android.view.autofill.IAutoFillManagerClient

import android.view.autofill.IAutoFillManagerClient

import android.widget.RemoteViews

import android.widget.RemoteViews

import android.widget.inline.InlinePresentationSpec

import android.widget.inline.InlinePresentationSpec
@@ -372,6 +373,7 @@ class CredentialAutofillService : AutofillService() { 




        fillResponseBuilder.addDataset(

        fillResponseBuilder.addDataset(

                Dataset.Builder()

                Dataset.Builder()

                        .setId(AutofillManager.PINNED_DATASET_ID)

                        .setField(

                        .setField(

                                autofillId,

                                autofillId,

                                Field.Builder().setPresentations(

                                Field.Builder().setPresentations(
@@ -411,6 +413,7 @@ class CredentialAutofillService : AutofillService() { 




        fillResponseBuilder.addDataset(

        fillResponseBuilder.addDataset(

                dataSetBuilder

                dataSetBuilder

                        .setId(AutofillManager.PINNED_DATASET_ID)

                        .setField(

                        .setField(

                                autofillId,

                                autofillId,

                                Field.Builder().setPresentations(

                                Field.Builder().setPresentations(

services/autofill/java/com/android/server/autofill/Session.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -170,8 +170,8 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.util.TimeUtils;

import android.util.TimeUtils;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillFeatureFlags;

import android.view.autofill.AutofillFeatureFlags;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillManager.AutofillCommitReason;

import android.view.autofill.AutofillManager.AutofillCommitReason;

import android.view.autofill.AutofillManager.SmartSuggestionMode;

import android.view.autofill.AutofillManager.SmartSuggestionMode;
@@ -5109,7 +5109,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
            return;

            return;

        }

        }

        for (Dataset dataset: response.getDatasets()) {

        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");

                Slog.d(TAG, "Adding Credential Manager callback to a pinned entry");

                addCredentialManagerCallbackForDataset(dataset, response.getRequestId());

                addCredentialManagerCallbackForDataset(dataset, response.getRequestId());

            }

            }