diff options
author | Tom Taylor <tomtaylor@google.com> | 2013-07-30 10:28:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-30 10:28:18 -0700 |
commit | ee25d0e52b2d7e6f6604e1e16c7d98c406ca9f41 (patch) | |
tree | 316ee968bdff016da55c449f3cb1d596082a7bc8 | |
parent | d11e25ba5e28f5e090fd95a2cfc230a1892a0d55 (diff) | |
parent | 848b54ae56cb8fa8264f65365db65dc7f1921f81 (diff) | |
download | mms-ee25d0e52b2d7e6f6604e1e16c7d98c406ca9f41.tar.gz |
am 848b54ae: Merge "Support MMS with empty subject"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev
* commit '848b54ae56cb8fa8264f65365db65dc7f1921f81':
Support MMS with empty subject
-rwxr-xr-x | src/java/com/google/android/mms/pdu/PduParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/google/android/mms/pdu/PduParser.java b/src/java/com/google/android/mms/pdu/PduParser.java index b42a9fd..6dabc76 100755 --- a/src/java/com/google/android/mms/pdu/PduParser.java +++ b/src/java/com/google/android/mms/pdu/PduParser.java @@ -1030,7 +1030,7 @@ public class PduParser { assert(-1 != temp); int first = temp & 0xFF; if (first == 0) { - return null; // Blank subject, bail. + return new EncodedStringValue(""); } pduDataStream.reset(); |