From bcc204dd6fa9888630348d85ebda033401a4cb0c Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Fri, 11 Jul 2014 15:11:02 -0700
Subject: [PATCH] Fix NPE in uiSaveDraftMessage

Verify that restoreMessageWithId returns a non-null result.

Bug:14655866
Change-Id: Ia48d5fd96a4314f4e10e9a8c3764ad52f2aa5eed
---
 src/com/android/email/provider/EmailProvider.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 7e0a391a2..3bd77a433 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);