commit 35e5b677c1e783f59c7ac67a61a264a7e036d8e5
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Nov 20 14:41:25 2009 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Nov 20 14:41:25 2009 -0800
tree de1b8fa1b3a0abecfae5d319946cd26f554b5269
parent 70ed7eac9316b90a0182fc2eeba015aa0e69b6a5
parent 863e6c40202fe804d92a263809da74ec1e904e66

Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-sholes-release

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index ece930c..68aa7de 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -142,7 +142,7 @@
     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 =