commit 14487f24c66e5bdf8556addbc018dfa699022a2d
author TYM Tsai <tymtsai@google.com> Fri Feb 10 06:20:24 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 06:20:24 2023 +0000
tree 3e4f8d440d047dbf3fcde25e1d3813ec63d230be
parent 117daee12617dda29fc1faae98ab9f50cfe2f56e
parent 4a9fc440b8511f8409dbf45fe0dec1dffd7936e7

Merge "Toast: Solve the NPE problem in session.java"

services/autofill/java/com/android/server/autofill/Session.java

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 5c11e2c..9c1933d 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 @@
                 && (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) -> {