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

Commit 1b80201c authored by Feng Cao's avatar Feng Cao
Browse files

Merge the autofill provider's inline spec with the IME's spec for authentication case 

* the autofill provider may not copy over the style spec provided
  by the IME, therefore framework should do the merge
* we did this for the regular dataset, but forgot to do it for
  the authentication in the FillResponse, this patch fixes it
* it was caught by our CTS test when I remove the fallback to
  the deprecated support lib rendering API

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

Change-Id: I963625973f916325d183a542b73d2c40f312ce9c
parent e6e7cdf1

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

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ final class InlineSuggestionFactory { 
        final Consumer<IntentSender> intentSenderConsumer = (intentSender) ->

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

        InlinePresentation inlineAuthentication = response.getInlinePresentation();

        return createInlineAuthSuggestion(inlineAuthentication,

        return createInlineAuthSuggestion(

                mergedInlinePresentation(request, 0, inlineAuthentication),

                remoteRenderService, onClickFactory, onErrorCallback, intentSenderConsumer,

                request.getHostInputToken(), request.getHostDisplayId());

    }