diff options
author | Fred Quintana <fredq@google.com> | 2009-08-31 17:20:08 -0700 |
---|---|---|
committer | Fred Quintana <fredq@google.com> | 2009-08-31 17:20:08 -0700 |
commit | c58b611652c62b269cdc323ff8285ef789b1853d (patch) | |
tree | f874337a7912ad6541a7f10d328bc8f9c77ecb1c /core/java/android | |
parent | 7cb08accdd923e05518f4bacd103bfe68d589e5d (diff) | |
download | frameworks_base-c58b611652c62b269cdc323ff8285ef789b1853d.zip frameworks_base-c58b611652c62b269cdc323ff8285ef789b1853d.tar.gz frameworks_base-c58b611652c62b269cdc323ff8285ef789b1853d.tar.bz2 |
Revert "- don't schedule syncs that we will never dispatch"
This reverts commit fae7ff106b3ed791e324ddcec17226c3fe1cd809.
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/content/SyncManager.java | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 0c5e082..15144a2 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -148,7 +148,6 @@ class SyncManager implements OnAccountsUpdatedListener { private volatile boolean mSyncPollInitialized; private final PendingIntent mSyncAlarmIntent; private final PendingIntent mSyncPollAlarmIntent; - private final ConnectivityManager mConnManager; private final SyncAdaptersCache mSyncAdapters; @@ -289,7 +288,6 @@ class SyncManager implements OnAccountsUpdatedListener { SyncStorageEngine.init(context); mSyncStorageEngine = SyncStorageEngine.getSingleton(); mSyncQueue = new SyncQueue(mSyncStorageEngine); - mConnManager = (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE); mContext = context; @@ -538,14 +536,6 @@ class SyncManager implements OnAccountsUpdatedListener { return; } - if (!mConnManager.getBackgroundDataSetting()) { - if (isLoggable) { - Log.v(TAG, "not syncing because background data usage isn't allowed"); - } - setStatusText("Sync is disabled."); - return; - } - if (mAccounts == null) setStatusText("The accounts aren't known yet."); if (!mDataConnectionIsConnected) setStatusText("No data connection"); if (mStorageIsLow) setStatusText("Memory low"); @@ -612,8 +602,6 @@ class SyncManager implements OnAccountsUpdatedListener { if (hasSyncAdapter) syncableAuthorities.add(requestedAuthority); } - final boolean masterSyncAutomatically = mSyncStorageEngine.getMasterSyncAutomatically(); - for (String authority : syncableAuthorities) { for (Account account : accounts) { int isSyncable = mSyncStorageEngine.getIsSyncable(account, authority); @@ -630,36 +618,22 @@ class SyncManager implements OnAccountsUpdatedListener { if (!syncAdapterInfo.type.supportsUploading() && uploadOnly) { continue; } - // make this an initialization sync if the isSyncable state is unknown Bundle extrasCopy = extras; - long delayCopy = delay; if (isSyncable < 0) { extrasCopy = new Bundle(extras); extrasCopy.putBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, true); - delayCopy = -1; // expedite this - } else { - final boolean syncAutomatically = masterSyncAutomatically - && mSyncStorageEngine.getSyncAutomatically(account, authority); - boolean syncAllowed = manualSync || syncAutomatically; - if (!syncAllowed) { - if (isLoggable) { - Log.d(TAG, "scheduleSync: sync of " + account + ", " + authority - + " is not allowed, dropping request"); - continue; - } - } } if (isLoggable) { Log.v(TAG, "scheduleSync:" - + " delay " + delayCopy + + " delay " + delay + ", source " + source + ", account " + account + ", authority " + authority + ", extras " + extrasCopy); } scheduleSyncOperation( - new SyncOperation(account, source, authority, extrasCopy, delayCopy)); + new SyncOperation(account, source, authority, extrasCopy, delay)); } } } @@ -1617,7 +1591,9 @@ class SyncManager implements OnAccountsUpdatedListener { // found that is runnable (not disabled, etc). If that one is ready to run then // start it, otherwise just get out. SyncOperation op; - final boolean backgroundDataUsageAllowed = mConnManager.getBackgroundDataSetting(); + final ConnectivityManager connManager = (ConnectivityManager) + mContext.getSystemService(Context.CONNECTIVITY_SERVICE); + final boolean backgroundDataUsageAllowed = connManager.getBackgroundDataSetting(); synchronized (mSyncQueue) { while (true) { op = mSyncQueue.head(); |