Merge commit 'bdb28c164494178fa5d62858c17876a8568470df' into eclair-mr2-plus-aosp * commit 'bdb28c164494178fa5d62858c17876a8568470df': Fix #2267475 (NPE when changing incoming settings for EAS)
This commit is contained in:
commit
0e030b6951
@ -324,7 +324,10 @@ public class SyncManager extends Service implements Runnable {
|
|||||||
// If it's a login failure, look a little harder
|
// If it's a login failure, look a little harder
|
||||||
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
|
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
|
||||||
// If it's for the account whose host has changed, clear the error
|
// If it's for the account whose host has changed, clear the error
|
||||||
if (m.mAccountKey == accountId) {
|
// If the mailbox is no longer around, remove the entry in the map
|
||||||
|
if (m == null) {
|
||||||
|
INSTANCE.mSyncErrorMap.remove(mailboxId);
|
||||||
|
} else if (m.mAccountKey == accountId) {
|
||||||
error.fatal = false;
|
error.fatal = false;
|
||||||
error.holdEndTime = 0;
|
error.holdEndTime = 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user