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

am bb11c911: Fix NPE sending mail on servers without Outbox folders

Browse Source 
Merge commit 'bb11c91175a4beee207324d67b913b91a41bbea7' into froyo-plus-aosp

* commit 'bb11c91175a4beee207324d67b913b91a41bbea7':
  Fix NPE sending mail on servers without Outbox folders
This commit is contained in:
Marc Blank 2010-04-20 11:53:07 -07:00 committed by Android Git Automerger
commit 9c85a39b82
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1651,8 +1651,9 @@ public class SyncManager extends Service implements Runnable {
for (long mailboxId: mServiceMap.keySet()) { for (long mailboxId: mServiceMap.keySet()) {
Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId); Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
if (m != null) { if (m != null) {
if (m.mAccountKey == accountId && String serverId = m.mServerId;
m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) { if (m.mAccountKey == accountId && serverId != null &&
serverId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
// Here's our account mailbox; reset him (stopping pings) // Here's our account mailbox; reset him (stopping pings)
AbstractSyncService svc = mServiceMap.get(mailboxId); AbstractSyncService svc = mServiceMap.get(mailboxId);
svc.reset(); svc.reset();