已有新建短信的情况下。文件管理中，使用短信分享图片，图片没有被添加进短信

--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -319,7 +319,7 @@ public class ComposeMessageActivity extends Activity
     private static final String TAG = LogTag.TAG;
     private static final String RCS_TAG = "RCS_UI";


-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
     private static final boolean TRACE = false;
     private static final boolean LOCAL_LOGV = false;
     private static final boolean DEBUG_MULTI_CHOICE = true;
@@ -2653,14 +2653,20 @@ public class ComposeMessageActivity extends Activity
         sameThread = ((conversation.getThreadId() == mConversation.getThreadId() ||
                 mConversation.getThreadId() == 0) &&
                 conversation.equals(mConversation));
-
+        log("-----onNewIntent: mConversation.getThreadId()=" + mConversation.getThreadId()
+                       + ", conversation.getThreadId()= " + conversation.getThreadId()+",threadId="+threadId);
         if (sameThread) {
-            log("onNewIntent: same conversation");
+            log("-----onNewIntent: same conversation");
             if (mConversation.getThreadId() == 0) {
                 mConversation = conversation;
                 mWorkingMessage.setConversation(mConversation);
                 updateThreadIdIfRunning();
                 invalidateOptionsMenu();
+                /* add by liuyanfeng 20151028 for SWBUG00037834 start */
+                saveDraft(false); // if we've got a draft, save it first
+                resetEditorText();
+                initialize(null, originalThreadId);
+                /* end */
             }
         } else {
             if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {