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

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

Change-Id: I7255cb7f245d7344a46324b3f9061bf8771bff0b
This commit is contained in:
Adam He
2021-07-27 18:51:07 +00:00
committed by Automerger Merge Worker

View File

@@ -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);