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

am ec11b965: Merge change 25348 into eclair

Browse Source 
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
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,7 +825,11 @@ public class SyncManager extends Service implements Runnable {
if (c.moveToFirst()) {
synchronized(sSyncToken) {
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
if (!force && (syncKey == null || syncKey.equals("0"))) {
return;
@ -1392,7 +1396,7 @@ public class SyncManager extends Service implements Runnable {
int type = c.getInt(Mailbox.CONTENT_TYPE_COLUMN);
if (type == Mailbox.TYPE_CONTACTS) {
// See if "sync automatically" is set
Account account =
Account account =
getAccountById(c.getInt(Mailbox.CONTENT_ACCOUNT_KEY_COLUMN));
if (account != null) {
android.accounts.Account a =