commit 64817e848552fd0a429a3e026b7b1562103c56bb
author Tom Taylor <tomtaylor@google.com> Wed Apr 30 15:58:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 30 15:58:48 2014 +0000
tree aab1f8f16c64f9856ad975842d95dc2b590a0b76
parent 2caa92096c32fa04debf9d8a77189bc438299f75
parent 5e585ccc80ad45b861a6cbce663afa5d3e903c5c

Merge "Can not download empty text file received in MMS"

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

diff --git a/src/java/com/google/android/mms/pdu/PduPersister.java b/src/java/com/google/android/mms/pdu/PduPersister.java
old mode 100644
new mode 100755
index e9b9e26..fa7dad1
--- a/src/java/com/google/android/mms/pdu/PduPersister.java
+++ b/src/java/com/google/android/mms/pdu/PduPersister.java
@@ -795,6 +795,9 @@
                     || ContentType.APP_SMIL.equals(contentType)
                     || ContentType.TEXT_HTML.equals(contentType)) {
                 ContentValues cv = new ContentValues();
+                if (data == null) {
+                    data = new String("").getBytes(CharacterSets.DEFAULT_CHARSET_NAME);
+                }
                 cv.put(Telephony.Mms.Part.TEXT, new EncodedStringValue(data).getString());
                 if (mContentResolver.update(uri, cv, null, null) != 1) {
                     throw new MmsException("unable to update " + uri.toString());