Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fe0c2b3 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Fix inline autofill not working if both afservice and keyboard support... 

Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: If605d300d5b7d4cbf7038566c885d6c274b60d46
parents 44d40568 e31184cb

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                    if (!mWaitForInlineRequest || mPendingInlineSuggestionsRequest != null) {

                    if (!mWaitForInlineRequest || mPendingInlineSuggestionsRequest != null) {

                        return;

                        return;

                    }

                    }

                    mWaitForInlineRequest = inlineSuggestionsRequest != null;

                    mPendingInlineSuggestionsRequest = inlineSuggestionsRequest;

                    mPendingInlineSuggestionsRequest = inlineSuggestionsRequest;

                    maybeRequestFillLocked();

                    maybeRequestFillLocked();

                    viewState.resetState(ViewState.STATE_PENDING_CREATE_INLINE_REQUEST);

                    viewState.resetState(ViewState.STATE_PENDING_CREATE_INLINE_REQUEST);