Fix HC -> ICS db upgrade

 Bug: 3249854
 When upgrading from HC to ICS, enable account sync for browser
 as in HC it defaulted to off whereas in ICS we default to on.

Change-Id: I69ccd535409c0e5b031efe087c09cc06281c2537

1 files changed, 20 insertions, 0 deletions

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index e40a882..fe7a31b 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -432,6 +432,26 @@ public class BrowserProvider2 extends SQLiteContentProvider {
             values.put(Settings.KEY, Settings.KEY_SYNC_ENABLED);
             values.put(Settings.VALUE, 1);
             insertSettingsInTransaction(db, values);
+            // Enable bookmark sync on all accounts
+            AccountManager am = (AccountManager) getContext().getSystemService(
+                    Context.ACCOUNT_SERVICE);
+            if (am == null) {
+                return;
+            }
+            Account[] accounts = am.getAccountsByType("com.google");
+            if (accounts == null || accounts.length == 0) {
+                return;
+            }
+            for (Account account : accounts) {
+                if (ContentResolver.getIsSyncable(
+                        account, BrowserContract.AUTHORITY) == 0) {
+                    // Account wasn't syncable, enable it
+                    ContentResolver.setIsSyncable(
+                            account, BrowserContract.AUTHORITY, 1);
+                    ContentResolver.setSyncAutomatically(
+                            account, BrowserContract.AUTHORITY, true);
+                }
+            }
         }
 
         boolean importFromBrowserProvider(SQLiteDatabase db) {