summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TYM Tsai <tymtsai@google.com> 2023-02-10 06:20:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-02-10 06:20:24 +0000
commit14487f24c66e5bdf8556addbc018dfa699022a2d (patch)
tree3e4f8d440d047dbf3fcde25e1d3813ec63d230be
parent117daee12617dda29fc1faae98ab9f50cfe2f56e (diff)
parent4a9fc440b8511f8409dbf45fe0dec1dffd7936e7 (diff)
Merge "Toast: Solve the NPE problem in session.java"
-rw-r--r--services/autofill/java/com/android/server/autofill/Session.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 5c11e2c2327e..9c1933db8b37 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -3840,8 +3840,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
&& (mSessionFlags.mAugmentedAutofillOnly
|| !mSessionFlags.mInlineSupportedByService
|| mSessionFlags.mExpiredResponse)
- && isViewFocusedLocked(flags)
- || isFillDialogUiEnabled()) {
+ && (isViewFocusedLocked(flags) || isRequestSupportFillDialog(flags))) {
if (sDebug) Slog.d(TAG, "Create inline request for augmented autofill");
remoteRenderService.getInlineSuggestionsRendererInfo(new RemoteCallback(
(extras) -> {