am c5abc6d6: am d493ba25: Merge change Ie90b74aa into eclair

Merge commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69' into eclair-mr2-plus-aosp

* commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69':
  Avoid NPE at onRefresh in MessageList
This commit is contained in:
satok 2009-10-05 19:44:24 -07:00 committed by Android Git Automerger
commit 75e1743874

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);
}
}
}