am db4d1aa5: am 6b93f61e: Merge change Ib35bb866 into eclair-mr2

Merge commit 'db4d1aa55575256e28a66d606a9a5e1d4c8a7fa1'

* commit 'db4d1aa55575256e28a66d606a9a5e1d4c8a7fa1':
  Don't allow "trash" to be synced (Fixes #2116463)
This commit is contained in:
Marc Blank 2009-11-19 09:05:17 -08:00 committed by Android Git Automerger
commit 5587a3ae2b

View File

@ -294,8 +294,8 @@ public class SyncManager extends Service implements Runnable {
kick("start outbox");
// Outbox can't be synced in EAS
return;
} else if (m.mType == Mailbox.TYPE_DRAFTS) {
// Drafts can't be synced in EAS
} else if (m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_TRASH) {
// Drafts & Trash can't be synced in EAS
return;
}
startManualSync(mailboxId, SyncManager.SYNC_SERVICE_START_SYNC, null);