am 75e17438: am c5abc6d6: am d493ba25: Merge change Ie90b74aa into eclair

Merge commit '75e1743874df41079c9e2369b9033d6e981ac088'

* commit '75e1743874df41079c9e2369b9033d6e981ac088':
  Avoid NPE at onRefresh in MessageList
This commit is contained in:
satok 2009-10-12 11:36:53 -07:00 committed by Android Git Automerger
commit 361efd4f9c

View File

@ -527,7 +527,9 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
// TODO: Should not be reading from DB in UI thread - need a cleaner way to get accountId
if (mMailboxId >= 0) {
Mailbox mailbox = Mailbox.restoreMailboxWithId(this, mMailboxId);
mController.updateMailbox(mailbox.mAccountKey, mMailboxId, mControllerCallback);
if (mailbox != null) {
mController.updateMailbox(mailbox.mAccountKey, mMailboxId, mControllerCallback);
}
}
}