aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-06-23 11:32:33 -0700
committerScott Mertz <scott@cyngn.com>2016-06-23 12:52:02 -0700
commit6c15a6abf4cde0326e4f23c62339a173b8c7d33e (patch)
tree4ef75c3ef02414267bd66de681db4e874616c479
parent36fc2cb17a1819e2669f71a738217391849730cd (diff)
downloadandroid_packages_apps_CMFileManager-6c15a6abf4cde0326e4f23c62339a173b8c7d33e.tar.gz
android_packages_apps_CMFileManager-6c15a6abf4cde0326e4f23c62339a173b8c7d33e.tar.bz2
android_packages_apps_CMFileManager-6c15a6abf4cde0326e4f23c62339a173b8c7d33e.zip
Assign application/octet-stream to unknown file extensions
FEIJ-1380 Change-Id: I93eea906f35dc5403349409b1c26e6a4fc386d5a (cherry picked from commit faa6c468930433b5ead67f99db88320cb45971b2)
-rw-r--r--src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
index ca371f72..b5157f18 100644
--- a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
@@ -491,7 +491,7 @@ public final class MimeTypeHelper {
private static final String getMimeTypeFromExtension(final FileSystemObject fso) {
String ext = FileHelper.getExtension(fso);
if (ext == null) {
- return null;
+ return "application/octet-stream";
}
// If this extension is ambiguous, attempt to resolve it.
@@ -503,7 +503,7 @@ public final class MimeTypeHelper {
//Load from the database of mime types
MimeTypeInfo mimeTypeInfo = getMimeTypeInternal(fso, ext);
if (mimeTypeInfo == null) {
- return null;
+ return "application/octet-stream";
}
return mimeTypeInfo.mMimeType;