Set the unique id of the AutoFill profile WebKit can read it

After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.

Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f

1 files changed, 8 insertions, 3 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 1dd2e8f..3d69249 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -223,6 +223,7 @@ public class WebSettings {
      * @hide for now, pending API council approval.
      */
     public static class AutoFillProfile {
+        private int mUniqueId;
         private String mFullName;
         private String mEmailAddress;
         private String mCompanyName;
@@ -234,10 +235,11 @@ public class WebSettings {
         private String mCountry;
         private String mPhoneNumber;
 
-        public AutoFillProfile(String fullName, String email,
+        public AutoFillProfile(int uniqueId, String fullName, String email,
                 String companyName, String addressLine1, String addressLine2,
                 String city, String state, String zipCode, String country,
                 String phoneNumber) {
+            mUniqueId = uniqueId;
             mFullName = fullName;
             mEmailAddress = email;
             mCompanyName = companyName;
@@ -250,6 +252,7 @@ public class WebSettings {
             mPhoneNumber = phoneNumber;
         }
 
+        public int getUniqueId() { return mUniqueId; }
         public String getFullName() { return mFullName; }
         public String getEmailAddress() { return mEmailAddress; }
         public String getCompanyName() { return mCompanyName; }
@@ -1613,8 +1616,10 @@ public class WebSettings {
      * @hide
      */
     public synchronized void setAutoFillProfile(AutoFillProfile profile) {
-        mAutoFillProfile = profile;
-        postSync();
+        if (mAutoFillProfile != profile) {
+            mAutoFillProfile = profile;
+            postSync();
+        }
     }
 
     int getDoubleTapToastCount() {