diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-07-14 22:29:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-14 18:38:02 +0000 |
| commit | 5c93d3661603843d6bc0b9084a2633c7e3d08ab9 (patch) | |
| tree | 08376782946d9da4dcd91a05fb5bbae0fd00e77c /src | |
| parent | 1fa51773bf50fc9a8cb3ee55eeab8e9aec7694b3 (diff) | |
| parent | bcc204dd6fa9888630348d85ebda033401a4cb0c (diff) | |
| download | android_packages_apps_Email-5c93d3661603843d6bc0b9084a2633c7e3d08ab9.tar.gz android_packages_apps_Email-5c93d3661603843d6bc0b9084a2633c7e3d08ab9.tar.bz2 android_packages_apps_Email-5c93d3661603843d6bc0b9084a2633c7e3d08ab9.zip | |
Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 02c7329ff..99c676590 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -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); |