diff options
author | Keith Mok <kmok@cyngn.com> | 2016-06-13 09:45:23 -0700 |
---|---|---|
committer | Keith Mok <kmok@cyngn.com> | 2016-06-15 15:59:04 -0700 |
commit | 203b3b6be7af90583dddfb99f0497e27730f59d3 (patch) | |
tree | 7e01a9dc3c83d2aaec01657311370ace090fc886 | |
parent | eefc63b1e4028c0cb59f297ff9f85892cb2b37aa (diff) | |
download | android_packages_apps_CMFileManager-203b3b6be7af90583dddfb99f0497e27730f59d3.tar.gz android_packages_apps_CMFileManager-203b3b6be7af90583dddfb99f0497e27730f59d3.tar.bz2 android_packages_apps_CMFileManager-203b3b6be7af90583dddfb99f0497e27730f59d3.zip |
Filter out vnd.android.cursor mimetype for Picker
We don't support vnd.android.cursor mimetype,
the return result is never be expected to caller.
Ideally, we should filter that mimetype in AndroidManifest.xml,
however we currently accept */* mimetype and there is no
way to exclude a specific mimetype.
FEIJ-1138 FEIJ-1140 FEIJ-1141
Change-Id: I407159c5f5283e4d5cec2ec129a7643723bc8602
(cherry picked from commit 83abccb05877572eff881d75e10ca01258c16e9e)
-rw-r--r-- | src/com/cyanogenmod/filemanager/activities/PickerActivity.java | 3 | ||||
-rw-r--r-- | src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java index 46194b01..707724a3 100644 --- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java @@ -253,7 +253,8 @@ public class PickerActivity extends Activity //- Mime/Type restriction String mimeType = getIntent().getType(); if (mimeType != null) { - if (!MimeTypeHelper.isMimeTypeKnown(this, mimeType)) { + if (!MimeTypeHelper.isMimeTypeKnown(this, mimeType) && + !MimeTypeHelper.isAndroidCursorMimeType(mimeType)) { Log.i(TAG, String.format( "Mime type %s unknown, falling back to wildcard.", //$NON-NLS-1$ diff --git a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java index 1ef77ed4..ca371f72 100644 --- a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java +++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java @@ -227,6 +227,17 @@ public final class MimeTypeHelper { } /** + * Method that checks whether it is a special android cursor mimetype + * that we don't support and should filter it all + * + * @param mimeType The mime type to be checked + * @return true if mime type is known, false otherwise + */ + public static final boolean isAndroidCursorMimeType(String mimeType) { + return mimeType.startsWith("vnd.android.cursor"); + } + + /** * Method that checks whether a certain mime type is known to * the application. * |