summaryrefslogtreecommitdiffstats
path: root/core/java/com/google
diff options
context:
space:
mode:
authorMatthias Thomae <matthias.thomae@teleca.com>2010-12-15 15:57:31 +0100
committerMatthias Thomae <matthias.thomae@teleca.com>2011-06-09 09:34:02 +0200
commitdde8d112e4bc0077da8d8f50b5ef8d1153aec7c8 (patch)
tree191f0fb3dc4cb3ec01dedcb8e6510aa6d0f0c7fc /core/java/com/google
parentf3894a04acb9cdd67a02a1a4c82ba7d178c13000 (diff)
downloadframeworks_base-dde8d112e4bc0077da8d8f50b5ef8d1153aec7c8.zip
frameworks_base-dde8d112e4bc0077da8d8f50b5ef8d1153aec7c8.tar.gz
frameworks_base-dde8d112e4bc0077da8d8f50b5ef8d1153aec7c8.tar.bz2
Add support for bmp and wav content types in MMS
This change adds support for bitmap images (.bmp) and wave audio (.wav) formats for MMS. This is a must-have requirement for some operators.
Diffstat (limited to 'core/java/com/google')
-rw-r--r--core/java/com/google/android/mms/ContentType.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/com/google/android/mms/ContentType.java b/core/java/com/google/android/mms/ContentType.java
index b066fad..12a1343 100644
--- a/core/java/com/google/android/mms/ContentType.java
+++ b/core/java/com/google/android/mms/ContentType.java
@@ -39,6 +39,7 @@ public class ContentType {
public static final String IMAGE_GIF = "image/gif";
public static final String IMAGE_WBMP = "image/vnd.wap.wbmp";
public static final String IMAGE_PNG = "image/png";
+ public static final String IMAGE_X_MS_BMP = "image/x-ms-bmp";
public static final String AUDIO_UNSPECIFIED = "audio/*";
public static final String AUDIO_AAC = "audio/aac";
@@ -58,6 +59,7 @@ public class ContentType {
public static final String AUDIO_X_MPEG = "audio/x-mpeg";
public static final String AUDIO_X_MPG = "audio/x-mpg";
public static final String AUDIO_3GPP = "audio/3gpp";
+ public static final String AUDIO_X_WAV = "audio/x-wav";
public static final String AUDIO_OGG = "application/ogg";
public static final String VIDEO_UNSPECIFIED = "video/*";
@@ -89,6 +91,7 @@ public class ContentType {
sSupportedContentTypes.add(IMAGE_WBMP);
sSupportedContentTypes.add(IMAGE_PNG);
sSupportedContentTypes.add(IMAGE_JPG);
+ sSupportedContentTypes.add(IMAGE_X_MS_BMP);
//supportedContentTypes.add(IMAGE_SVG); not yet supported.
sSupportedContentTypes.add(AUDIO_AAC);
@@ -106,6 +109,7 @@ public class ContentType {
sSupportedContentTypes.add(AUDIO_X_MPEG3);
sSupportedContentTypes.add(AUDIO_X_MPEG);
sSupportedContentTypes.add(AUDIO_X_MPG);
+ sSupportedContentTypes.add(AUDIO_X_WAV);
sSupportedContentTypes.add(AUDIO_3GPP);
sSupportedContentTypes.add(AUDIO_OGG);
@@ -127,6 +131,7 @@ public class ContentType {
sSupportedImageTypes.add(IMAGE_WBMP);
sSupportedImageTypes.add(IMAGE_PNG);
sSupportedImageTypes.add(IMAGE_JPG);
+ sSupportedImageTypes.add(IMAGE_X_MS_BMP);
// add supported audio types
sSupportedAudioTypes.add(AUDIO_AAC);
@@ -145,6 +150,7 @@ public class ContentType {
sSupportedAudioTypes.add(AUDIO_X_MPEG3);
sSupportedAudioTypes.add(AUDIO_X_MPEG);
sSupportedAudioTypes.add(AUDIO_X_MPG);
+ sSupportedAudioTypes.add(AUDIO_X_WAV);
sSupportedAudioTypes.add(AUDIO_3GPP);
sSupportedAudioTypes.add(AUDIO_OGG);