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

Commit 37223280 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix augmented autofill to not send multiple request on the same field"... 

Merge "Fix augmented autofill to not send multiple request on the same field" into rvc-dev am: 10017115 am: a2ddae62 am: 0f91d12e am: 6f34d5be

Change-Id: Iac057358d40faafa7354f9961e6803fc09a14440
parents 66ef4d6e 6f34d5be

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

+18 −12
Original line number Diff line number Diff line
@@ -2459,19 +2459,25 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                    return;

                }



                if (!isSameViewEntered

                        && (flags & FLAG_MANUAL_REQUEST) == 0

                        && mAugmentedAutofillableIds != null

                        && mAugmentedAutofillableIds.contains(id)) {

                    // View was already reported when server could not handle a response, but it

                if ((flags & FLAG_MANUAL_REQUEST) == 0) {

                    // Not a manual request

                    if (mAugmentedAutofillableIds != null && mAugmentedAutofillableIds.contains(

                            id)) {

                        // Regular autofill handled the view and returned null response, but it

                        // triggered augmented autofill



                    if (sDebug) Slog.d(TAG, "updateLocked(" + id + "): augmented-autofillable");



                    // ...then trigger the augmented autofill UI

                        if (!isSameViewEntered) {

                            if (sDebug) Slog.d(TAG, "trigger augmented autofill.");

                            triggerAugmentedAutofillLocked();

                        } else {

                            if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");

                        }

                        return;

                    } else if (mForAugmentedAutofillOnly && isSameViewEntered) {

                        // Regular autofill is disabled.

                        if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");

                        return;

                    }

                }



                if (requestNewFillResponseOnViewEnteredIfNecessaryLocked(id, viewState, flags)) {

                    return;