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

Commit 9a9e335e authored by takuo's avatar takuo
Browse files

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

parents 4b9633c2 9ef961dc

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 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/CharacterSets.java

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class CharacterSets { 
    public static final int ISO_8859_7  = 0x0A;

    public static final int ISO_8859_8  = 0x0B;

    public static final int ISO_8859_9  = 0x0C;

    public static final int ISO_2022_JP = 0x27;

    public static final int SHIFT_JIS   = 0x11;

    public static final int UTF_8       = 0x6A;

    public static final int BIG5        = 0x07EA;
@@ -65,6 +66,7 @@ public class CharacterSets { 
        ISO_8859_7,

        ISO_8859_8,

        ISO_8859_9,

        ISO_2022_JP,

        SHIFT_JIS,

        UTF_8,

        BIG5,
@@ -86,6 +88,7 @@ public class CharacterSets { 
    public static final String MIMENAME_ISO_8859_7  = "iso-8859-7";

    public static final String MIMENAME_ISO_8859_8  = "iso-8859-8";

    public static final String MIMENAME_ISO_8859_9  = "iso-8859-9";

    public static final String MIMENAME_ISO_2022_JP = "iso-2022-jp";

    public static final String MIMENAME_SHIFT_JIS   = "shift_JIS";

    public static final String MIMENAME_UTF_8       = "utf-8";

    public static final String MIMENAME_BIG5        = "big5";
@@ -109,6 +112,7 @@ public class CharacterSets { 
        MIMENAME_ISO_8859_7,

        MIMENAME_ISO_8859_8,

        MIMENAME_ISO_8859_9,

        MIMENAME_ISO_2022_JP,

        MIMENAME_SHIFT_JIS,

        MIMENAME_UTF_8,

        MIMENAME_BIG5,

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

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 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"