aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-06-22 09:31:03 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-06-23 15:28:33 -0700
commit70addacba1dfc3d89c6094bf1a942dafdcaff0da (patch)
treeb694ba659158418070c54cb1a24ce3368d404f6b
parentfaa6c468930433b5ead67f99db88320cb45971b2 (diff)
downloadandroid_packages_apps_CMFileManager-70addacba1dfc3d89c6094bf1a942dafdcaff0da.tar.gz
android_packages_apps_CMFileManager-70addacba1dfc3d89c6094bf1a942dafdcaff0da.tar.bz2
android_packages_apps_CMFileManager-70addacba1dfc3d89c6094bf1a942dafdcaff0da.zip
Fix no icon for 3GP files
Commit 6f6094da21960569b93f6171e39e211e8d37f41a does not do what it said. It said " We are now defaulting to treating 3GP files as video files for determining the default icon as it was parsing the video files for their metadata which was causing ANR problems." However it returns no icon for 3GP. Fix it to do what it said in that commit. FEIJ-202 FEIJ-1347 Change-Id: Ieb57583316594c0308792ff8b43aadf1b15d74a5
-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 b5157f18..cf08b0e6 100644
--- a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
@@ -472,8 +472,8 @@ public final class MimeTypeHelper {
MimeTypeInfo mimeTypeInfo = null;
ArrayList<MimeTypeInfo> mimeTypeInfoList = sMimeTypes.get(ext.toLowerCase(Locale.ROOT));
// Multiple mimetypes map to the same extension, try to resolve it.
- if (mimeTypeInfoList != null && mimeTypeInfoList.size() > 1 && !firstFound) {
- if (absolutePath != null) {
+ if (mimeTypeInfoList != null && mimeTypeInfoList.size() > 1) {
+ if ((absolutePath != null) && (!firstFound)) {
String mimeType = getAmbiguousExtensionMimeType(absolutePath, ext);
mimeTypeInfo = sExtensionMimeTypes.get(ext + mimeType);
} else {