diff options
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-11-15 11:38:04 -0800 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-11-15 11:38:04 -0800 |
| commit | c15cc97158b5e55eb3bd6cad6985b5cf29c2665e (patch) | |
| tree | 4720207f5b5dca6b66e94a82d7e0c9cdaaf76640 | |
| parent | c3d3eed574d9e8835caaf4043daf7f8498a904f9 (diff) | |
| parent | e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4 (diff) | |
| download | Mms-c15cc97158b5e55eb3bd6cad6985b5cf29c2665e.tar.gz | |
Merge commit 'e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4' into eclair-sholes-release
| -rw-r--r-- | src/com/android/mms/ui/ComposeMessageActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java index d550095e..e6cec9cb 100644 --- a/src/com/android/mms/ui/ComposeMessageActivity.java +++ b/src/com/android/mms/ui/ComposeMessageActivity.java @@ -1781,7 +1781,7 @@ public class ComposeMessageActivity extends Activity 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"); |