am 9122a49c: am d163f4ba: Merge change 25853 into eclair

Merge commit '9122a49cd68ab2a472516c568298699f376bf80a'

* commit '9122a49cd68ab2a472516c568298699f376bf80a':
  Don't back up / restore certain sync-related settings

core/java/android/content/SyncStorageEngine.java

@@ -346,16 +346,6 @@ public class SyncStorageEngine extends Handler {
                 }
             }
         }
-        // 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 getSyncAutomatically(Account account, String providerName) {

core/java/android/provider/Settings.java

@@ -2406,7 +2406,6 @@ public final class Settings {
             WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
             WIFI_NUM_ALLOWED_CHANNELS,
             WIFI_NUM_OPEN_NETWORKS_KEPT,
-            BACKGROUND_DATA,
         };
 
         /**