commit 1b80201cf7b1ea52f819ef7fcef1378553082257
author Feng Cao <fengcao@google.com> Wed May 13 19:31:09 2020 -0700
committer Feng Cao <fengcao@google.com> Wed May 13 19:31:14 2020 -0700
tree 34576167d6a9181bedd1a773553f05fd8003cfe3
parent e6e7cdf1afd3cb7ef5f5ebf5730a954cb1542c9b

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

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

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 089eeb2..e39c544 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 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());
     }