summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author hupeng3 <hp121520@gmail.com> 2023-02-06 14:53:32 +0800
committer Hu Peng <hp121520@gmail.com> 2023-02-08 01:51:36 +0000
commit4a9fc440b8511f8409dbf45fe0dec1dffd7936e7 (patch)
tree6e1b2adc9b6f3af671da7553054f00544a46f892
parent52cdf7372d535862dd7489d7a7d233a4da993f42 (diff)
Toast: Solve the NPE problem in session.java
In the if statement here, 'isFillDialogUiEnabled' should not be an independent '||' operation, which will cause the previous addition to be invalid. It should be in the same level as 'isViewFocusedLocked', and use 'isRequestSupportFillDialog' replace. Bug: 267986308 Test: Manual Signed-off-by: hupeng3 <hp121520@gmail.com> Change-Id: I8adc5eb7f24f2189e22b469f7c677bb2206cf3c8
-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) -> {