diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-17 11:03:34 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-17 11:03:35 -0800 |
| commit | c2461eb32ebad522a946e9fef9c31e886d98124a (patch) | |
| tree | 9b5749c4e95c4e2d1b379084ee528acdae8dc3b4 /core/java/com/google | |
| parent | a1ee18f1413471813f36a1d05927f5513c8931f5 (diff) | |
| parent | dde8d112e4bc0077da8d8f50b5ef8d1153aec7c8 (diff) | |
| download | frameworks_base-c2461eb32ebad522a946e9fef9c31e886d98124a.zip frameworks_base-c2461eb32ebad522a946e9fef9c31e886d98124a.tar.gz frameworks_base-c2461eb32ebad522a946e9fef9c31e886d98124a.tar.bz2 | |
Merge "Add support for bmp and wav content types in MMS"
Diffstat (limited to 'core/java/com/google')
| -rw-r--r-- | core/java/com/google/android/mms/ContentType.java | 6 |
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); |