diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-28 07:37:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-28 07:37:55 +0000 |
| commit | d06ca16bd2141879f329ea7a33b94ab586b889f0 (patch) | |
| tree | c21d027f7b36edd6711c73bb25a7bee6273a862d | |
| parent | 356d68054d60d8bc43da10b9267447043ea301af (diff) | |
| parent | eab095fb2326177ecd2fa734b80b89ed758e5ce5 (diff) | |
Merge "Fixes expired response does not work with augmented autofill" into rvc-dev
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/Session.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 06c60a3d08eb..37ed6f790c19 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -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; |