diff options
author | Ahaan Ugale <augale@google.com> | 2020-06-05 15:21:13 -0700 |
---|---|---|
committer | Ahaan Ugale <augale@google.com> | 2020-06-05 15:21:13 -0700 |
commit | 5e24f194a00992b87f7d3e0be67e3f83a7024ab5 (patch) | |
tree | e8538b7c3b53b733fce092049f55c502146b8d1e /services/autofill | |
parent | bb9ea4e1fa38a9448589b4521aff06ec05ad1567 (diff) |
AF Inline: Don't stop filtering after a suggestion was selected.
This is consistent with dropdown.
The current logic was implemented incorrectly in
I396c2cb279f1eb552bbae8c3509cb29c95e86609.
Fix: 158274878
Test: manual
Test: atest CtsAutoFillServiceTestCases:DatasetFilteringInlineTest
CtsAutoFillServiceTestCases:InlineFilteringTest
CtsAutoFillServiceTestCases:DatasetFilteringDropdownTest
Change-Id: I6d67945944e616d0c30b19eb1430383be754b67c
Diffstat (limited to 'services/autofill')
-rw-r--r-- | services/autofill/java/com/android/server/autofill/Session.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 642526d13aff..a9a0ab69f633 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -2715,7 +2715,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState final ViewState currentView = mViewStates.get(mCurrentViewId); currentView.maybeCallOnFillReady(flags); } - } else if (viewState.id.equals(this.mCurrentViewId) + } + + if (viewState.id.equals(this.mCurrentViewId) && (viewState.getState() & ViewState.STATE_INLINE_SHOWN) != 0) { if ((viewState.getState() & ViewState.STATE_INLINE_DISABLED) != 0) { mInlineSessionController.disableFilterMatching(viewState.id); |