commit 69020b73255ffbe3ddff14fc6a542d5db2eefe3d
author Mark Wagner <mxw@google.com> Tue Nov 17 16:13:16 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 17 16:13:16 2009 -0800
tree 153eeefa133f89bc6be597fc560f43d6292b04c1
parent 4788b3148bc618db1401388484f015fa3de24ea4
parent fe537b3fe4145e3cec41b70b93c366e1c2307ed5

am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2

Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check

core/java/com/google/android/mms/pdu/PduPersister.java

diff --git a/core/java/com/google/android/mms/pdu/PduPersister.java b/core/java/com/google/android/mms/pdu/PduPersister.java
index 2a1f23a..1f754bc 100644
--- a/core/java/com/google/android/mms/pdu/PduPersister.java
+++ b/core/java/com/google/android/mms/pdu/PduPersister.java
@@ -424,6 +424,9 @@
                     // faster.
                     if ("text/plain".equals(type) || "application/smil".equals(type)) {
                         String text = c.getString(PART_COLUMN_TEXT);
+                        if (text == null) {
+                            text = "";
+                        }
                         byte [] blob = new EncodedStringValue(text).getTextString();
                         baos.write(blob, 0, blob.length);
                     } else {
@@ -858,7 +861,7 @@
         } else {
             values.put(Mms.SUBJECT, "");
         }
-        
+
         long messageSize = sendReq.getMessageSize();
         if (messageSize > 0) {
             values.put(Mms.MESSAGE_SIZE, messageSize);