Merge "Force a settings sync when updating the auto-fill profile."
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 3a6349a..22fc3c3 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -423,6 +423,11 @@
     public void setAutoFillProfile(AutoFillProfile profile, Message msg) {
         mAutofillHandler.waitForLoad();
         mAutofillHandler.setAutoFillProfile(profile, msg);
+        // Auto-fill will reuse the same profile ID when making edits to the profile,
+        // so we need to force a settings sync (otherwise the SharedPreferences
+        // manager will optimise out the call to onSharedPreferenceChanged(), as
+        // it thinks nothing has changed).
+        syncManagedSettings();
     }
 
     public void toggleDebugSettings() {