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

am bdb28c16: Fix #2267475 (NPE when changing incoming settings for EAS)

Browse Source 
Merge commit 'bdb28c164494178fa5d62858c17876a8568470df' into eclair-mr2-plus-aosp

* commit 'bdb28c164494178fa5d62858c17876a8568470df':
  Fix #2267475 (NPE when changing incoming settings for EAS)
This commit is contained in:
Marc Blank 2009-11-19 09:05:07 -08:00 committed by Android Git Automerger
commit 0e030b6951
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,10 @@ public class SyncManager extends Service implements Runnable {
// If it's a login failure, look a little harder
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
// 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.holdEndTime = 0;
}