summaryrefslogtreecommitdiff
path: root/services/autofill/java
diff options
context:
space:
mode:
authorFeng Cao <fengcao@google.com>2020-06-15 15:55:26 -0700
committerFeng Cao <fengcao@google.com>2020-06-15 20:23:17 -0700
commit5d6243e47a699d75309e0fe56549f3553e409228 (patch)
treefb048619009157592a03b46da8ad5c872f7f0c96 /services/autofill/java
parentf3e7dfe156660afda023be4d4d49bb8ec75a3efe (diff)
Fix a bug to not complete the augmented autofill request when fill window is shown
* The bug was introduced in ag/11784240 causing the existing CTS test to fail: android.autofillservice.cts.augmented.AugmentedLoginActivityTest #testCancellationSignalCalled_retriggerAugmentedAutofill * Basically when the dropdown fill window is displayed, we should not mark the augmented autofill request as complete Test: atest android.autofillservice.cts.augmented Test: atest android.autofillservice.cts.inline Bug: 158864213 Bug: 158038231 Change-Id: Ifb75189c1ba3183c99516bfb9a7053524f4bbddc
Diffstat (limited to 'services/autofill/java')
-rw-r--r--services/autofill/java/com/android/server/autofill/RemoteAugmentedAutofillService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/autofill/java/com/android/server/autofill/RemoteAugmentedAutofillService.java b/services/autofill/java/com/android/server/autofill/RemoteAugmentedAutofillService.java
index a7d0061cc043..47aa44f3c24c 100644
--- a/services/autofill/java/com/android/server/autofill/RemoteAugmentedAutofillService.java
+++ b/services/autofill/java/com/android/server/autofill/RemoteAugmentedAutofillService.java
@@ -167,14 +167,16 @@ final class RemoteAugmentedAutofillService
new IFillCallback.Stub() {
@Override
public void onSuccess(@Nullable List<Dataset> inlineSuggestionsData,
- @Nullable Bundle clientState) {
+ @Nullable Bundle clientState, boolean showingFillWindow) {
mCallbacks.resetLastResponse();
maybeRequestShowInlineSuggestions(sessionId,
inlineSuggestionsRequest, inlineSuggestionsData,
clientState, focusedId, focusedValue,
inlineSuggestionsCallback,
client, onErrorCallback, remoteRenderService);
- requestAutofill.complete(null);
+ if (!showingFillWindow) {
+ requestAutofill.complete(null);
+ }
}
@Override