commit e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4
author Tom Taylor <tomtaylor@google.com> Fri Nov 13 16:02:04 2009 -0800
committer Tom Taylor <tomtaylor@google.com> Fri Nov 13 16:02:04 2009 -0800
tree 0cbd148929bf99be274653d083b25cc67fd5f5e9
parent 21f3bbb9a7a143e4f39195308900b76444859404

Fix null ref

Fixes bug 2261398.

Change-Id: Idb4db938e93b792248d49410b9474c71d5d4bb37

src/com/android/mms/ui/ComposeMessageActivity.java

diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index d5c0495..2eb4dd7 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -1781,7 +1781,7 @@
             log("     new conversation=" + conversation + ", mConversation=" + mConversation);
         }
 
-        long convThreadId = conversation.getThreadId();
+        long convThreadId = conversation == null ? 0 : conversation.getThreadId();
         if (sameThread || (convThreadId != 0 && convThreadId == mConversation.getThreadId())) {
             if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                 log("onNewIntent: same conversation");