Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes expired response does not work with augmented autofill" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-28 07:37:55 +00:00
committed by Android (Google) Code Review
parent 356d68054d eab095fb23
commit d06ca16bd2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -2588,14 +2588,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
id)) { id)) {
// Regular autofill handled the view and returned null response, but it // Regular autofill handled the view and returned null response, but it
// triggered augmented autofill // triggered augmented autofill
if (!isSameViewEntered) { if (!isSameViewEntered || mExpiredResponse) {
if (sDebug) Slog.d(TAG, "trigger augmented autofill."); if (sDebug) Slog.d(TAG, "trigger augmented autofill.");
triggerAugmentedAutofillLocked(flags); triggerAugmentedAutofillLocked(flags);
} else { } else {
if (sDebug) Slog.d(TAG, "skip augmented autofill for same view."); if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
} }
return; return;
} else if (mForAugmentedAutofillOnly && isSameViewEntered) { } else if (mForAugmentedAutofillOnly && isSameViewEntered
&& !mExpiredResponse) {
// Regular autofill is disabled. // Regular autofill is disabled.
if (sDebug) Slog.d(TAG, "skip augmented autofill for same view."); if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
return; return;