Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 021b7b44: Add a static method to obtain the mime type from extension.

Browse Source 
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp

* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
  Add a static method to obtain the mime type from extension.
This commit is contained in:
Patrick Scott
2010-01-13 11:37:33 -08:00
committed by Android Git Automerger
parent ace8addce4 021b7b443f
commit 70c4f6cfb4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/MimeTypeMap.java
View File

@@ -124,6 +124,11 @@ public class MimeTypeMap {
return null;
}
// Static method called by jni.
private static String mimeTypeFromExtension(String extension) {
return getSingleton().getMimeTypeFromExtension(extension);
}
/**
* Return true if the given extension has a registered MIME type.
* @param extension A file extension without the leading '.'
@@ -344,6 +349,7 @@ public class MimeTypeMap {
sMimeTypeMap.loadEntry("application/x-pkcs7-crl", "crl");
sMimeTypeMap.loadEntry("application/x-quicktimeplayer", "qtl");
sMimeTypeMap.loadEntry("application/x-shar", "shar");
sMimeTypeMap.loadEntry("application/x-shockwave-flash", "swf");
sMimeTypeMap.loadEntry("application/x-stuffit", "sit");
sMimeTypeMap.loadEntry("application/x-sv4cpio", "sv4cpio");
sMimeTypeMap.loadEntry("application/x-sv4crc", "sv4crc");