summaryrefslogtreecommitdiff
path: root/services/autofill
diff options
context:
space:
mode:
authorAhaan Ugale <augale@google.com>2020-06-09 04:57:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-09 04:57:59 +0000
commit0575b5a2111b7e2fbfb0304a0bde15901214eb80 (patch)
treee897391867d8eb43d1e41aac220035212bf536d0 /services/autofill
parentf16abc4f88bf7b12218ef6ebfdba0e9ad63bf238 (diff)
parent5e24f194a00992b87f7d3e0be67e3f83a7024ab5 (diff)
Merge "AF Inline: Don't stop filtering after a suggestion was selected." into rvc-dev
Diffstat (limited to 'services/autofill')
-rw-r--r--services/autofill/java/com/android/server/autofill/Session.java4
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);