From 0df08228be165655b99b01bd2078031969a77aee Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Fri, 28 Jun 2019 12:40:44 -0700
Subject: [PATCH] Fix delay_save and multiple required fields.

Fixes: 136120151
Test: atest android.autofillservice.cts.SimpleSaveActivityTest#testDelayedSave
Change-Id: Ie0fd8ef0fbb8457fafc7cb5bed30813abaa0b893

Exempt-From-Owner-Approval: Felipe is no longer with the team
---
 services/autofill/java/com/android/server/autofill/Session.java  | 1 +
 .../autofill/java/com/android/server/autofill/ViewState.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 895a2ae497585..d260985190f72 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -2929,6 +2929,7 @@ private ViewState createOrUpdateViewStateLocked(@NonNull AutofillId id, int stat
             if (sVerbose) {
                 Slog.v(TAG, "Adding autofillable view with id " + id + " and state " + state);
             }
+            viewState.setCurrentValue(findValueLocked(id));
             mViewStates.put(id, viewState);
         }
         if ((state & ViewState.STATE_AUTOFILLED) != 0) {
diff --git a/services/autofill/java/com/android/server/autofill/ViewState.java b/services/autofill/java/com/android/server/autofill/ViewState.java
index e1b089cf28b27..84886f83027d2 100644
--- a/services/autofill/java/com/android/server/autofill/ViewState.java
+++ b/services/autofill/java/com/android/server/autofill/ViewState.java
@@ -227,6 +227,7 @@ public String toString() {
         if (mVirtualBounds != null) {
             builder.append(", virtualBounds:" ).append(mVirtualBounds);
         }
+        builder.append("]");
         return builder.toString();
     }