diff options
| author | Fred Quintana <fredq@google.com> | 2011-12-05 16:45:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-05 16:45:29 -0800 |
| commit | b5f2dfbc221d3dc799232e0ada3b6621d3d4d597 (patch) | |
| tree | 973c3f09662a857815be716ac16f1ef85ce55955 /core | |
| parent | 3124e6f9e96b730cdfbbf068f15c41b6d5c8a819 (diff) | |
| parent | 33e446941722b0e31a453399e92e0e82697f05aa (diff) | |
| download | frameworks_base-b5f2dfbc221d3dc799232e0ada3b6621d3d4d597.zip frameworks_base-b5f2dfbc221d3dc799232e0ada3b6621d3d4d597.tar.gz frameworks_base-b5f2dfbc221d3dc799232e0ada3b6621d3d4d597.tar.bz2 | |
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index b2909b3..3c4e545 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -24,6 +24,7 @@ import com.google.android.collect.Maps; import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.OnAccountsUpdateListener; +import android.app.ActivityManager; import android.app.AlarmManager; import android.app.Notification; import android.app.NotificationManager; @@ -86,8 +87,13 @@ public class SyncManager implements OnAccountsUpdateListener { private static final long MAX_TIME_PER_SYNC; static { - MAX_SIMULTANEOUS_INITIALIZATION_SYNCS = SystemProperties.getInt("sync.max_init_syncs", 5); - MAX_SIMULTANEOUS_REGULAR_SYNCS = SystemProperties.getInt("sync.max_regular_syncs", 2); + final boolean isLargeRAM = ActivityManager.isLargeRAM(); + int defaultMaxInitSyncs = isLargeRAM ? 5 : 2; + int defaultMaxRegularSyncs = isLargeRAM ? 2 : 1; + MAX_SIMULTANEOUS_INITIALIZATION_SYNCS = + SystemProperties.getInt("sync.max_init_syncs", defaultMaxInitSyncs); + MAX_SIMULTANEOUS_REGULAR_SYNCS = + SystemProperties.getInt("sync.max_regular_syncs", defaultMaxRegularSyncs); LOCAL_SYNC_DELAY = SystemProperties.getLong("sync.local_sync_delay", 30 * 1000 /* 30 seconds */); MAX_TIME_PER_SYNC = |