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

am 5aac4a74: Fix bug #2071895 (NPE); remove unused method.

Browse Source 
Merge commit '5aac4a74961b4424e6cf3d263aee51c76d5e9e55'

* commit '5aac4a74961b4424e6cf3d263aee51c76d5e9e55':
  Fix bug #2071895 (NPE); remove unused method.
This commit is contained in:
Marc Blank 2009-08-22 12:19:13 -07:00 committed by Android Git Automerger
commit ca06839da6
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1424,8 +1424,10 @@ public class SyncManager extends Service implements Runnable {
if (INSTANCE.mServiceMap.get(mailboxId) == null) {
INSTANCE.mSyncErrorMap.remove(mailboxId);
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
INSTANCE.log("Starting sync for " + m.mDisplayName);
INSTANCE.startService(m, reason, req);
if (m != null) {
INSTANCE.log("Starting sync for " + m.mDisplayName);
INSTANCE.startService(m, reason, req);
}
}
}
return INSTANCE.mServiceMap.get(mailboxId);
@ -1461,17 +1463,6 @@ public class SyncManager extends Service implements Runnable {
}
}
static public void kick(long mailboxId) {
if (INSTANCE == null) return;
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
int syncType = m.mSyncInterval;
if (syncType == Mailbox.CHECK_INTERVAL_PUSH) {
SyncManager.serviceRequestImmediate(mailboxId);
} else {
SyncManager.startManualSync(mailboxId, SYNC_KICK, null);
}
}
static public void accountUpdated(long acctId) {
if (INSTANCE == null) return;
synchronized (sSyncToken) {