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

Commit 5a2a8e7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
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."
parents b51da746 2d3dd2ea

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

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

                    mWaitForInlineRequest = inlineSuggestionsRequest != null;

                    mPendingInlineSuggestionsRequest = inlineSuggestionsRequest;

                    mWaitForInlineRequest = inlineSuggestionsRequest != null;

                    maybeRequestFillFromServiceLocked();

                    viewState.resetState(ViewState.STATE_PENDING_CREATE_INLINE_REQUEST);

                }
@@ -860,7 +861,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) -> {