ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6b93f61e: Merge change Ib35bb866 into eclair-mr2

Browse Source 
Merge commit '6b93f61eea40f83e2bb35aa45fb0301b48225260' into eclair-mr2-plus-aosp

* commit '6b93f61eea40f83e2bb35aa45fb0301b48225260':
  Don't allow "trash" to be synced (Fixes #2116463)
This commit is contained in:
Marc Blank 2009-11-19 09:01:18 -08:00 committed by Android Git Automerger
commit db4d1aa555
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/exchange/SyncManager.java
View File

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