commit eea916967af9c97533dbce45e74c48e054802dc7
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 29 18:11:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 29 18:11:01 2019 +0000
tree 3488065ab6b639c48ed796734e1d51c183897a0c
parent 4c4690233874c5b50679c9e340c00588b7eaa087
parent 0df08228be165655b99b01bd2078031969a77aee

Merge "Fix delay_save and multiple required fields." into qt-dev

services/autofill/java/com/android/server/autofill/Session.java

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 895a2ae..d260985 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 @@
             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) {

services/autofill/java/com/android/server/autofill/ViewState.java

diff --git a/services/autofill/java/com/android/server/autofill/ViewState.java b/services/autofill/java/com/android/server/autofill/ViewState.java
index e1b089c..84886f8 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 @@
         if (mVirtualBounds != null) {
             builder.append(", virtualBounds:" ).append(mVirtualBounds);
         }
+        builder.append("]");
         return builder.toString();
     }