diff options
| author | Keith Mok <kmok@cyngn.com> | 2016-06-22 09:31:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-09-30 04:30:24 -0700 |
| commit | 7303d578b8c0bd68a5c9f5dd3621c7f1317fa43d (patch) | |
| tree | 19035e7dd8ef2eb74bd132ce2722f1473c1512dd | |
| parent | 3ff8593bd358a69505662c0e452db0863a1916d5 (diff) | |
| download | android_packages_apps_CMFileManager-7303d578b8c0bd68a5c9f5dd3621c7f1317fa43d.tar.gz android_packages_apps_CMFileManager-7303d578b8c0bd68a5c9f5dd3621c7f1317fa43d.tar.bz2 android_packages_apps_CMFileManager-7303d578b8c0bd68a5c9f5dd3621c7f1317fa43d.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
(cherry picked from commit 70addacba1dfc3d89c6094bf1a942dafdcaff0da)
| -rw-r--r-- | src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java | 4 |
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 { |