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

Commit 7c978ecc authored by Feng Cao's avatar Feng Cao
Browse files

Only clear inline suggestions when IMS.onInputFinish is called 

* Don't clear inline suggestions when receiving VIEW_EXIT from
  Autofill session
* Don't clear inline suggestions when IME becomes invisible
  from IMS.onInputViewFinish(), instead only clear when
  IMS.onInputFinish() is called
* Don't clear inline suggestions when launching an intent from
  inline action chip (be it authentication intent or regular
  action)

Test: atest android.autofillservice.cts.inline
Bug: 156099633

Change-Id: I8bebec3135410131e12c62e37b8a63a3702f7fac
parent e6e7cdf1

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

+5 −5
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ final class AutofillInlineSuggestionsRequestSession { 
        if (mDestroyed || mResponseCallback == null) {

            return;

        }

        if (!mImeInputViewStarted && mPreviousResponseIsNotEmpty) {

            // 1. if previous response is not empty, and IME just become invisible, then send

            // empty response to make sure existing responses don't stick around on the IME.

        if (!mImeInputStarted && mPreviousResponseIsNotEmpty) {

            // 1. if previous response is not empty, and IME is just disconnected from the view,

            // then send empty response to make sure existing responses don't stick around.

            // Although the inline suggestions should disappear when IME hides which removes them

            // from the view hierarchy, but we still send an empty response to be extra safe.



            // from the view hierarchy, but we still send an empty response to indicate that the

            // previous suggestions are invalid now.

            if (sVerbose) Slog.v(TAG, "Send empty inline response");

            updateResponseToImeUncheckLocked(new InlineSuggestionsResponse(Collections.EMPTY_LIST));

            mPreviousResponseIsNotEmpty = false;

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

+6 −2
Original line number Diff line number Diff line
@@ -2573,7 +2573,6 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                    if (sVerbose) Slog.v(TAG, "Exiting view " + id);

                    mUi.hideFillUi(this);

                    hideAugmentedAutofillLocked(viewState);

                    mInlineSessionController.hideInlineSuggestionsUiLocked(mCurrentViewId);

                    mCurrentViewId = null;

                }

                break;
@@ -2647,6 +2646,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                if (sVerbose) {

                    Slog.v(TAG, "ignoring autofilled change on id " + id);

                }

                // TODO(b/156099633): remove this once framework gets out of business of resending

                // inline suggestions when IME visibility changes.

                mInlineSessionController.hideInlineSuggestionsUiLocked(viewState.id);

                viewState.resetState(ViewState.STATE_CHANGED);

                return;

            } else if ((viewState.id.equals(this.mCurrentViewId))
@@ -3339,7 +3341,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                if (generateEvent) {

                    mService.logDatasetSelected(dataset.getId(), id, mClientState);

                }



                if (mCurrentViewId != null) {

                    mInlineSessionController.hideInlineSuggestionsUiLocked(mCurrentViewId);

                }

                autoFillApp(dataset);

                return;

            }

services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ final class InlineSuggestionFactory { 
            @NonNull AutoFillUI.AutoFillUiCallback client, @NonNull Runnable onErrorCallback,

            @Nullable RemoteInlineSuggestionRenderService remoteRenderService) {

        final BiConsumer<Dataset, Integer> onClickFactory = (dataset, datasetIndex) -> {

            client.requestHideFillUi(autofillId);

            client.authenticate(response.getRequestId(),

                    datasetIndex, response.getAuthentication(), response.getClientState(),

                    /* authenticateInline= */ true);
@@ -85,7 +84,6 @@ final class InlineSuggestionFactory { 
        final Consumer<IntentSender> intentSenderConsumer = (intentSender) ->

                client.startIntentSender(intentSender, new Intent());

        final BiConsumer<Dataset, Integer> onClickFactory = (dataset, datasetIndex) -> {

            client.requestHideFillUi(autofillId);

            client.fill(requestId, datasetIndex, dataset);

        };