Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c81921b8 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://github.com/takuo/android_frameworks_base into eclair

parents eec1d955 4a5916fd

core/java/com/google/android/mms/ContentType.java

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ public class ContentType { 
    public static final String MMS_GENERIC       = "application/vnd.wap.mms-generic";

    public static final String MULTIPART_MIXED   = "application/vnd.wap.multipart.mixed";

    public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";

    public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";



    public static final String TEXT_PLAIN        = "text/plain";

    public static final String TEXT_HTML         = "text/html";

core/java/com/google/android/mms/pdu/PduParser.java

+1 −10
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public class PduParser { 
                }

                String ctTypeStr = new String(contentType);

                if (ctTypeStr.equals(ContentType.MULTIPART_MIXED)

                        || ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)

                        || ctTypeStr.equals(ContentType.MULTIPART_RELATED)) {

                    // The MMS content type must be "application/vnd.wap.multipart.mixed"

                    // or "application/vnd.wap.multipart.related"
@@ -699,8 +698,7 @@ public class PduParser { 
                case PduHeaders.ADDITIONAL_HEADERS:

                case PduHeaders.ATTRIBUTES:

                default: {

                    log("Unknown header: '" + headerField + "', exit parsing.");

		    keepParsing = false;

                    log("Unknown header");

                }

            }

        }
@@ -740,7 +738,6 @@ public class PduParser { 
            } else {

                part.setContentType((PduContentTypes.contentTypes[0]).getBytes()); //"*/*"

            }

	    String contentTypeStr = new String(part.getContentType());



            /* get name parameter */

            byte[] name = (byte[]) map.get(PduPart.P_NAME);
@@ -782,11 +779,6 @@ public class PduParser { 
            if (dataLength > 0) {

                byte[] partData = new byte[dataLength];

                pduDataStream.read(partData, 0, dataLength);

		if (contentTypeStr.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {

		    PduBody nestedBody = parseParts(new ByteArrayInputStream(partData));

		    part = nestedBody.getPart(0);



		} else {

                // Check Content-Transfer-Encoding.

                byte[] partDataEncoding = part.getContentTransferEncoding();

                if (null != partDataEncoding) {
@@ -806,7 +798,6 @@ public class PduParser { 
                    return null;

                }

                part.setData(partData);

		} /*  multipart/alternative */

            }



            /* add this part to body */