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

Merge "Fix augmented autofill to not send multiple request on the same field" into rvc-dev am: 1001711551

Browse Source 
Change-Id: I825b84194c39d25ccc6a48628c29720b3298cacc
This commit is contained in:
Automerger Merge Worker
2020-03-04 01:04:47 +00:00
parent 819c52823d 1001711551
commit a2ddae621b
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2459,18 +2459,24 @@ 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
// triggered augmented autofill
if (sDebug) Slog.d(TAG, "updateLocked(" + id + "): augmented-autofillable");
// ...then trigger the augmented autofill UI
triggerAugmentedAutofillLocked();
return;
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 (!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)) {