summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Taylor <tomtaylor@google.com>2014-04-30 15:58:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-30 15:58:48 +0000
commit64817e848552fd0a429a3e026b7b1562103c56bb (patch)
treeaab1f8f16c64f9856ad975842d95dc2b590a0b76
parent2caa92096c32fa04debf9d8a77189bc438299f75 (diff)
parent5e585ccc80ad45b861a6cbce663afa5d3e903c5c (diff)
downloadmms-64817e848552fd0a429a3e026b7b1562103c56bb.tar.gz
Merge "Can not download empty text file received in MMS"android-l-preview_r2l-previewidea133-weekly-release
-rwxr-xr-x[-rw-r--r--]src/java/com/google/android/mms/pdu/PduPersister.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/java/com/google/android/mms/pdu/PduPersister.java b/src/java/com/google/android/mms/pdu/PduPersister.java
index e9b9e26..fa7dad1 100644..100755
--- a/src/java/com/google/android/mms/pdu/PduPersister.java
+++ b/src/java/com/google/android/mms/pdu/PduPersister.java
@@ -795,6 +795,9 @@ public class PduPersister {
|| 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());