From e5d754e16ce59f55d8522dc87255e311c7b87f5e Mon Sep 17 00:00:00 2001 From: Martin Hibdon Date: Wed, 26 Mar 2014 10:38:51 -0700 Subject: [PATCH] Fix a NPE trying to download an attachment b/13642247 Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a (cherry picked from commit adabb4285b81663da718a1e756fd849a1afdb520) --- src/com/android/email/service/EmailServiceStub.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java index cb13a0f29..cd9dbdf6e 100644 --- a/src/com/android/email/service/EmailServiceStub.java +++ b/src/com/android/email/service/EmailServiceStub.java @@ -155,8 +155,10 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm // 2. Open the remote folder. final Account account = Account.restoreAccountWithId(mContext, message.mAccountKey); Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMailboxKey); - - if (mailbox.mType == Mailbox.TYPE_OUTBOX) { + if (mailbox == null) { + // This could be null if the account is deleted at just the wrong time. + return; + } else if (mailbox.mType == Mailbox.TYPE_OUTBOX) { long sourceId = Utility.getFirstRowLong(mContext, Body.CONTENT_URI, new String[] {BodyColumns.SOURCE_MESSAGE_KEY}, BodyColumns.MESSAGE_KEY + "=?",