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

Commit 0d590685 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes expired response does not work with augmented autofill" into... 

Merge "Fixes expired response does not work with augmented autofill" into rvc-dev am: d06ca16b am: 48b04125 am: 68d149ab am: 1c2c8d3c

Change-Id: I64640b75a000ae1f354c070eba8c301b4d46c862
parents 105d231d 1c2c8d3c

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

+3 −2
Original line number Diff line number Diff line
@@ -2588,14 +2588,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                            id)) {

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

                        // triggered augmented autofill

                        if (!isSameViewEntered) {

                        if (!isSameViewEntered || mExpiredResponse) {

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

                            triggerAugmentedAutofillLocked(flags);

                        } else {

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

                        }

                        return;

                    } else if (mForAugmentedAutofillOnly && isSameViewEntered) {

                    } else if (mForAugmentedAutofillOnly && isSameViewEntered

                            && !mExpiredResponse) {

                        // Regular autofill is disabled.

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

                        return;