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

Fix NPE in uiSaveDraftMessage 

Verify that restoreMessageWithId returns a non-null result.

Bug:14655866
Change-Id: Ia48d5fd96a4314f4e10e9a8c3764ad52f2aa5eed
This commit is contained in:
Jay Shrauner 2014-07-11 15:11:02 -07:00
parent 6cf6b5c292
commit bcc204dd6f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/email/provider/EmailProvider.java
View File

@ -4887,11 +4887,12 @@ public class EmailProvider extends ContentProvider
final Mailbox mailbox =
getMailboxByAccountIdAndType(accountId, Mailbox.TYPE_DRAFTS);
if (mailbox == null) return null;
final Message msg;
Message msg = null;
if (extras.containsKey(BaseColumns._ID)) {
final long messageId = extras.getLong(BaseColumns._ID);
msg = Message.restoreMessageWithId(getContext(), messageId);
} else {
}
if (msg == null) {
msg = new Message();
}
return uiSaveMessage(msg, mailbox, extras);