am 3463b401: am 42c130dc: Fix bug in which EAS mail won\'t ever get sent (#2118279)

Merge commit '3463b401466628f58118d74f0a1a7ee51edb27b5'

* commit '3463b401466628f58118d74f0a1a7ee51edb27b5':
  Fix bug in which EAS mail won't ever get sent (#2118279)
This commit is contained in:
Marc Blank 2009-09-16 18:02:04 -07:00 committed by Android Git Automerger
commit 91e0daeb85

View File

@ -146,8 +146,9 @@ public class SyncManager extends Service implements Runnable {
private static final String WHERE_PROTOCOL_EAS = HostAuthColumns.PROTOCOL + "=\"" +
AbstractSyncService.EAS_PROTOCOL + "\"";
private static final String WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN =
MailboxColumns.SYNC_INTERVAL + "!=" + Mailbox.CHECK_INTERVAL_NEVER + " and " +
MailboxColumns.ACCOUNT_KEY + " in (";
"(" + MailboxColumns.TYPE + '=' + Mailbox.TYPE_OUTBOX
+ " or " + MailboxColumns.SYNC_INTERVAL + "!=" + Mailbox.CHECK_INTERVAL_NEVER + ')'
+ " and " + MailboxColumns.ACCOUNT_KEY + " in (";
// Offsets into the syncStatus data for EAS that indicate type, exit status, and change count
// The format is S<type_char>:<exit_char>:<change_count>