diff options
| author | Marc Blank <mblank@google.com> | 2009-11-20 13:36:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 13:36:30 -0800 |
| commit | 5e353e3f77f3c50029601047ccf2193bcb78b3fc (patch) | |
| tree | de1b8fa1b3a0abecfae5d319946cd26f554b5269 | |
| parent | 52b06a1de642baccb70f2840902c537f7bd6f1ef (diff) | |
| parent | d457c744cde468c3bd9b92f28a140379c714f540 (diff) | |
| download | android_packages_apps_Email-5e353e3f77f3c50029601047ccf2193bcb78b3fc.tar.gz android_packages_apps_Email-5e353e3f77f3c50029601047ccf2193bcb78b3fc.tar.bz2 android_packages_apps_Email-5e353e3f77f3c50029601047ccf2193bcb78b3fc.zip | |
am d457c744: Merge change Ic1a2e5b9 into eclair
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-plus-aosp
* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
Fix improper constant to allow retry for sending Exchange mail
| -rw-r--r-- | src/com/android/exchange/SyncManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java index ece930cf7..68aa7de7e 100644 --- a/src/com/android/exchange/SyncManager.java +++ b/src/com/android/exchange/SyncManager.java @@ -142,7 +142,7 @@ public class SyncManager extends Service implements Runnable { protected static final String WHERE_IN_ACCOUNT_AND_PUSHABLE = MailboxColumns.ACCOUNT_KEY + "=? and type in (" + Mailbox.TYPE_INBOX + ',' + Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + ',' + Mailbox.TYPE_CONTACTS + ')'; - private static final String WHERE_MAILBOX_KEY = EmailContent.RECORD_ID + "=?"; + private static final String WHERE_MAILBOX_KEY = Message.MAILBOX_KEY + "=?"; private static final String WHERE_PROTOCOL_EAS = HostAuthColumns.PROTOCOL + "=\"" + AbstractSyncService.EAS_PROTOCOL + "\""; private static final String WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN = |