diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-12-14 09:44:51 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2011-12-14 09:45:04 -0800 |
| commit | affa29ac50f49106882c4464ad63a68354cc4810 (patch) | |
| tree | 171e6237586186e75f2d7731cff2cd67931f9166 /core/java/com/google | |
| parent | 926d55eb40b9042c200f154fdf0c7c7969e0e359 (diff) | |
| download | frameworks_base-affa29ac50f49106882c4464ad63a68354cc4810.zip frameworks_base-affa29ac50f49106882c4464ad63a68354cc4810.tar.gz frameworks_base-affa29ac50f49106882c4464ad63a68354cc4810.tar.bz2 | |
Received MMS is not displayed properly with 'Avea' SIM Card
Bug 5729514
Hand merge a patch from Samsung to fix:
"From Avea server the subject and length in MMS coming like as "...96 00...".
It means subject header present but subject length is zero.
As per accepted principles of MMS headers, if the header length is zero it should not be sent.
Android framework code does not handle this siutation and parsing fails always."
Change-Id: I930aa1e97f5e2e6eb69a94b7380c114272330232
Diffstat (limited to 'core/java/com/google')
| -rwxr-xr-x | core/java/com/google/android/mms/pdu/PduParser.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/google/android/mms/pdu/PduParser.java b/core/java/com/google/android/mms/pdu/PduParser.java index f7f71ed..015d864 100755 --- a/core/java/com/google/android/mms/pdu/PduParser.java +++ b/core/java/com/google/android/mms/pdu/PduParser.java @@ -934,6 +934,9 @@ public class PduParser { int temp = pduDataStream.read(); assert(-1 != temp); int first = temp & 0xFF; + if (first == 0) { + return null; // Blank subject, bail. + } pduDataStream.reset(); if (first < TEXT_MIN) { |