resolved conflicts for merge of b7195159 to master

diff --cc core/java/android/content/SyncStorageEngine.java
index aaba7c7,f781e0d..13bcdd3
--- 1/core/java/android/content/SyncStorageEngine.java
--- 2/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@@ -24,7 -24,7 +24,8 @@@ import org.xmlpull.v1.XmlPullParser
  import org.xmlpull.v1.XmlPullParserException;
  import org.xmlpull.v1.XmlSerializer;
  
 +import android.accounts.Account;
+ import android.backup.IBackupManager;
  import android.database.Cursor;
  import android.database.sqlite.SQLiteDatabase;
  import android.database.sqlite.SQLiteException;
@@@ -339,9 -353,19 +341,19 @@@ public class SyncStorageEngine extends 
                  }
              }
          }
+         // Inform the backup manager about a data change
+         IBackupManager ibm = IBackupManager.Stub.asInterface(
+                 ServiceManager.getService(Context.BACKUP_SERVICE));
+         if (ibm != null) {
+             try {
+                 ibm.dataChanged("com.android.providers.settings");
+             } catch (RemoteException e) {
+                 // Try again later
+             }
+         }
      }
-     
+ 
 -    public boolean getSyncProviderAutomatically(String account, String providerName) {
 +    public boolean getSyncAutomatically(Account account, String providerName) {
          synchronized (mAuthorities) {
              if (account != null) {
                  AuthorityInfo authority = getAuthorityLocked(account, providerName,

diff --cc packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index d67f6f5,5f3fba8..0becaa3
--- 1/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
--- 2/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@@ -69,12 -98,21 +98,23 @@@ public class SettingsHelper 
          }
      }
  
-     static final String[] PROVIDERS = { "gmail-ls", "calendar", "contacts" };
-     
+     private void setRingerMode() {
+         if (mSilent) {
+             mAudioManager.setRingerMode(mVibrate ? AudioManager.RINGER_MODE_VIBRATE :
+                 AudioManager.RINGER_MODE_SILENT);
+         } else {
+             mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+             mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
+                     mVibrate ? AudioManager.VIBRATE_SETTING_ON
+                             : AudioManager.VIBRATE_SETTING_OFF);
+         }
+     }
+ 
+     /* TODO: Get a list of all sync providers and save/restore the settings */
      byte[] getSyncProviders() {
          byte[] sync = new byte[1 + PROVIDERS.length];
 +        // TODO: Sync backup needs to be moved to SystemBackupAgent
 +        /*
          try {
              sync[0] = (byte) (mContentService.getListenForNetworkTickles() ? 1 : 0);
              for (int i = 0; i < PROVIDERS.length; i++) {
@@@ -85,10 -123,9 +125,10 @@@
              Log.w(TAG, "Unable to backup sync providers");
              return sync;
          }
 +        */
          return sync;
      }
-     
+ 
      void setSyncProviders(BackupDataInput backup) {
          byte[] sync = new byte[backup.getDataSize()];