summaryrefslogtreecommitdiff
path: root/services/autofill/java
diff options
context:
space:
mode:
authorFeng Cao <fengcao@google.com>2020-05-14 16:22:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-14 16:22:53 +0000
commitc505bf8f933ec92337840dc9a9dc6fd0a8f85770 (patch)
tree2ab0e20585506dd0a72d89a8bc6bdef4819d7bb4 /services/autofill/java
parentc12ddbbc0633039d56b86ea48e3ca9ab96a8b09e (diff)
parent1b80201cf7b1ea52f819ef7fcef1378553082257 (diff)
Merge "Merge the autofill provider's inline spec with the IME's spec for authentication case" into rvc-dev
Diffstat (limited to 'services/autofill/java')
-rw-r--r--services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java3
1 files changed, 2 insertions, 1 deletions
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 8cc0de473328..c8485b7c2b38 100644
--- a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java
+++ b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java
@@ -64,7 +64,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());
}