From 1b80201cf7b1ea52f819ef7fcef1378553082257 Mon Sep 17 00:00:00 2001 From: Feng Cao Date: Wed, 13 May 2020 19:31:09 -0700 Subject: [PATCH] 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 --- .../android/server/autofill/ui/InlineSuggestionFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java index 089eeb2aa086a..e39c544390662 100644 --- a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java +++ b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java @@ -65,7 +65,8 @@ final class InlineSuggestionFactory { final Consumer 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()); }