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

Commit 2d3dd2ea authored by Adam He's avatar Adam He
Browse files

Fix inline autofill not working if both afservice and keyboard support 

it, but keyboard disabled inline support manually.

Bug: 194434936
Test: atest android.autofillservice.cts.inline
Change-Id: I54d4d76c62edf0258febf3769a9882f03185bc17
parent 77e32b89

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

+2 −1
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                        return;

                    }

                    mPendingInlineSuggestionsRequest = inlineSuggestionsRequest;

                    mWaitForInlineRequest = inlineSuggestionsRequest != null;

                    maybeRequestFillFromServiceLocked();

                    viewState.resetState(ViewState.STATE_PENDING_CREATE_INLINE_REQUEST);

                }
@@ -853,7 +854,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        if ((mSessionFlags.mInlineSupportedByService || mSessionFlags.mClientSuggestionsEnabled)

                && remoteRenderService != null

                && isViewFocusedLocked(flags)) {

            Consumer<InlineSuggestionsRequest> inlineSuggestionsRequestConsumer;

            final Consumer<InlineSuggestionsRequest> inlineSuggestionsRequestConsumer;

            if (mSessionFlags.mClientSuggestionsEnabled) {

                final int finalRequestId = requestId;

                inlineSuggestionsRequestConsumer = (inlineSuggestionsRequest) -> {