Merge "Do not replace the authenticated dataset for pinned inline suggestion" into rvc-dev

2 files changed, 22 insertions, 5 deletions

diff --git a/core/java/android/service/autofill/Dataset.java b/core/java/android/service/autofill/Dataset.java
index 08aa534be152..2d99c413cc89 100644
--- a/core/java/android/service/autofill/Dataset.java
+++ b/core/java/android/service/autofill/Dataset.java
@@ -312,7 +312,12 @@ public final class Dataset implements Parcelable {
          * setting it to the {@link
          * android.view.autofill.AutofillManager#EXTRA_AUTHENTICATION_RESULT} extra. If you
          * provide a dataset in the result, it will replace the authenticated dataset and
-         * will be immediately filled in. If you provide a response, it will replace the
+         * will be immediately filled in. An exception to this behavior is if the original
+         * dataset represents a pinned inline suggestion (i.e. any of the field in the dataset
+         * has a pinned inline presentation, see {@link InlinePresentation#isPinned()}), then
+         * the original dataset will not be replaced,
+         * so that it can be triggered as a pending intent again.
+         * If you provide a response, it will replace the
          * current response and the UI will be refreshed. For example, if you provided
          * credit card information without the CVV for the data set in the {@link FillResponse
          * response} then the returned data set should contain the CVV entry.
diff --git a/core/java/android/service/autofill/InlinePresentation.java b/core/java/android/service/autofill/InlinePresentation.java
index 9cf1b87f7eab..914169485979 100644
--- a/core/java/android/service/autofill/InlinePresentation.java
+++ b/core/java/android/service/autofill/InlinePresentation.java
@@ -50,7 +50,11 @@ public final class InlinePresentation implements Parcelable {
 
     /**
      * Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the
-     * host.
+     * host. However, it's eventually up to the host whether the UI is pinned or not.
+     *
+     * <p> Also a {@link Dataset} with a pinned inline presentation will not be replaced by the
+     * new data set returned from authentication intent. See
+     * {@link Dataset.Builder#setAuthentication(android.content.IntentSender)} for more information.
      */
     private final boolean mPinned;
 
@@ -90,7 +94,11 @@ public final class InlinePresentation implements Parcelable {
      *   Specifies the UI specification for the inline suggestion.
      * @param pinned
      *   Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the
-     *   host.
+     *   host. However, it's eventually up to the host whether the UI is pinned or not.
+     *
+     *   <p> Also a {@link Dataset} with a pinned inline presentation will not be replaced by the
+     *   new data set returned from authentication intent. See
+     *   {@link Dataset.Builder#setAuthentication(android.content.IntentSender)} for more information.
      */
     @DataClass.Generated.Member
     public InlinePresentation(
@@ -126,7 +134,11 @@ public final class InlinePresentation implements Parcelable {
 
     /**
      * Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the
-     * host.
+     * host. However, it's eventually up to the host whether the UI is pinned or not.
+     *
+     * <p> Also a {@link Dataset} with a pinned inline presentation will not be replaced by the
+     * new data set returned from authentication intent. See
+     * {@link Dataset.Builder#setAuthentication(android.content.IntentSender)} for more information.
      */
     @DataClass.Generated.Member
     public boolean isPinned() {
@@ -232,7 +244,7 @@ public final class InlinePresentation implements Parcelable {
     };
 
     @DataClass.Generated(
-            time = 1586992400667L,
+            time = 1593131904745L,
             codegenVersion = "1.0.15",
             sourceFile = "frameworks/base/core/java/android/service/autofill/InlinePresentation.java",
             inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final  boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)")