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

Commit 2857adc6 authored by Feng Cao's avatar Feng Cao Committed by Automerger Merge Worker
Browse files

Merge "Fix a bug where we didn't call IME before calling augmented autofill"... 

Merge "Fix a bug where we didn't call IME before calling augmented autofill" into rvc-dev am: 4add1559 am: ba146c2d

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

Change-Id: I2872671cab996343fc9ef98f61b3d3dc4a08738a
parents 11d3d941 ba146c2d

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

+5 −2
Original line number Diff line number Diff line
@@ -3279,16 +3279,19 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                };



        // When the inline suggestion render service is available and the view is focused, there

        // are 2 cases when augmented autofill should ask IME for inline suggestion request,

        // are 3 cases when augmented autofill should ask IME for inline suggestion request,

        // because standard autofill flow didn't:

        // 1. the field is augmented autofill only (when standard autofill provider is None or

        // when it returns null response)

        // 2. standard autofill provider doesn't support inline suggestion

        // 3. we re-entered the autofill session and standard autofill was not re-triggered, this is

        //    recognized by seeing mExpiredResponse == true

        final RemoteInlineSuggestionRenderService remoteRenderService =

                mService.getRemoteInlineSuggestionRenderServiceLocked();

        if (remoteRenderService != null

                && (mForAugmentedAutofillOnly

                || !isInlineSuggestionsEnabledByAutofillProviderLocked())

                || !isInlineSuggestionsEnabledByAutofillProviderLocked()

                || mExpiredResponse)

                && isViewFocusedLocked(flags)) {

            if (sDebug) Slog.d(TAG, "Create inline request for augmented autofill");

            remoteRenderService.getInlineSuggestionsRendererInfo(new RemoteCallback(