summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ahaan Ugale <augale@google.com> 2022-05-07 00:22:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-07 00:22:30 +0000
commita23a8274a63f45f804979ff0db7b2693aa399735 (patch)
treed584bfe82bc6d6278ba04361228e9413369d03b5
parent8c452a65316a31a616a5f4659a9d129d704c404c (diff)
parent13809febba7b632a270da2448d791ec95cb38fb6 (diff)
Merge "Fix AutofillManager and Session status not sync with fill dialog" into tm-dev am: 13809febba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130748 Change-Id: Ibd5f7c24f1c5329b1e623cd0bf720a04c8a8d661 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/autofill/java/com/android/server/autofill/Session.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 8e32a7a8e255..6d3620fa2ee6 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -3225,10 +3225,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
currentView.setState(ViewState.STATE_FILL_DIALOG_SHOWN);
mService.logDatasetShown(id, mClientState, UI_TYPE_DIALOG);
}
+ // Just show fill dialog once, so disabled after shown.
+ // Note: Cannot disable before requestShowFillDialog() because the method
+ // need to check whether fill dialog enabled.
+ setFillDialogDisabled();
return;
} else {
setFillDialogDisabled();
}
+
}
if (response.supportsInlineSuggestions()) {