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

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 f7f71ed5f921..015d864a01ea 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) {