am ec11b965: Merge change 25348 into eclair

Merge commit 'ec11b9658b162c8abcf9757591df4fc49639565f' into eclair-plus-aosp

* commit 'ec11b9658b162c8abcf9757591df4fc49639565f':
  Fix "reloadFolderList" service call in SyncManager
This commit is contained in:
Marc Blank 2009-09-16 14:33:28 -07:00 committed by Android Git Automerger
commit b8ed678308

View File

@ -825,7 +825,11 @@ public class SyncManager extends Service implements Runnable {
if (c.moveToFirst()) { if (c.moveToFirst()) {
synchronized(sSyncToken) { synchronized(sSyncToken) {
Mailbox m = new Mailbox().restore(c); Mailbox m = new Mailbox().restore(c);
String syncKey = m.mSyncKey; Account acct = Account.restoreAccountWithId(context, accountId);
if (acct == null) {
return;
}
String syncKey = acct.mSyncKey;
// No need to reload the list if we don't have one // No need to reload the list if we don't have one
if (!force && (syncKey == null || syncKey.equals("0"))) { if (!force && (syncKey == null || syncKey.equals("0"))) {
return; return;